[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 600a10: Merge remote-tracking branch
|
From: |
Juanjo Menent |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 600a10: Merge remote-tracking branch 'upstream/3.9' into 3... |
|
Date: |
Fri, 09 Sep 2016 07:34:28 -0700 |
Branch: refs/heads/4.0
Home: https://github.com/Dolibarr/dolibarr
Commit: 600a10fa16fac32304808d5d0c6958fb4c33c920
https://github.com/Dolibarr/dolibarr/commit/600a10fa16fac32304808d5d0c6958fb4c33c920
Author: Juanjo Menent <address@hidden>
Date: 2016-07-25 (Mon, 25 Jul 2016)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/tpl/stockcorrection.tpl.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.9' into 3.9
Commit: 9e67249b98301441e7f9efe87c3de98642f8eafb
https://github.com/Dolibarr/dolibarr/commit/9e67249b98301441e7f9efe87c3de98642f8eafb
Author: Juanjo Menent <address@hidden>
Date: 2016-07-25 (Mon, 25 Jul 2016)
Changed paths:
M htdocs/core/class/html.formprojet.class.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.9' into 3.9
Commit: aadf52fe59afcb08df33c5b4f51f8d64652a5316
https://github.com/Dolibarr/dolibarr/commit/aadf52fe59afcb08df33c5b4f51f8d64652a5316
Author: Juanjo Menent <address@hidden>
Date: 2016-08-03 (Wed, 03 Aug 2016)
Changed paths:
M ChangeLog
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/fiche-stat.php
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/js/lib_head.js.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/modProductBatch.class.php
M htdocs/don/card.php
M htdocs/filefunc.inc.php
M htdocs/fourn/facture/list.php
M htdocs/product/admin/product.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/list.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.9' into 3.9
Commit: 1253b7387989573b9711bc53cd3a0116ba4a9ed8
https://github.com/Dolibarr/dolibarr/commit/1253b7387989573b9711bc53cd3a0116ba4a9ed8
Author: Juanjo Menent <address@hidden>
Date: 2016-08-04 (Thu, 04 Aug 2016)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.9' into 3.9
Commit: b1401d65666fd693a91b500a1ac36fdcfe77d754
https://github.com/Dolibarr/dolibarr/commit/b1401d65666fd693a91b500a1ac36fdcfe77d754
Author: Juanjo Menent <address@hidden>
Date: 2016-08-31 (Wed, 31 Aug 2016)
Changed paths:
M htdocs/admin/ihm.php
M htdocs/commande/list.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/modules/barcode/mod_barcode_product_standard.php
M htdocs/core/modules/barcode/modules_barcode.class.php
M htdocs/cron/class/cronjob.class.php
M htdocs/install/pgsql/functions/functions.sql
M htdocs/product/class/product.class.php
M htdocs/product/stock/product.php
M htdocs/resource/class/resource.class.php
M test/phpunit/Functions2LibTest.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.9' into 3.9
Commit: 4e5105c2201c3b5c0c9969ae460eea34dc123d09
https://github.com/Dolibarr/dolibarr/commit/4e5105c2201c3b5c0c9969ae460eea34dc123d09
Author: Juanjo Menent <address@hidden>
Date: 2016-09-06 (Tue, 06 Sep 2016)
Changed paths:
M htdocs/admin/ihm.php
M htdocs/comm/index.php
M htdocs/commande/list.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/modules/barcode/mod_barcode_product_standard.php
M htdocs/core/modules/barcode/modules_barcode.class.php
M htdocs/cron/class/cronjob.class.php
M htdocs/install/pgsql/functions/functions.sql
M htdocs/product/class/product.class.php
M htdocs/product/price.php
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/product/stock/product.php
M htdocs/resource/class/resource.class.php
M htdocs/societe/soc.php
M htdocs/webservices/server_contact.php
M htdocs/webservices/server_order.php
M test/phpunit/Functions2LibTest.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.9' into 3.9
Commit: d2ef56f3f10a87953134d666e9b96ed67f05ad18
https://github.com/Dolibarr/dolibarr/commit/d2ef56f3f10a87953134d666e9b96ed67f05ad18
Author: Juanjo Menent <address@hidden>
Date: 2016-09-06 (Tue, 06 Sep 2016)
Log Message:
-----------
Merge remote-tracking branch 'origin/3.9' into 3.9
Commit: 3078e6fa4b8a76fbf0d2ff98ab6ad2ee86a4a2fe
https://github.com/Dolibarr/dolibarr/commit/3078e6fa4b8a76fbf0d2ff98ab6ad2ee86a4a2fe
Author: Juanjo Menent <address@hidden>
Date: 2016-09-06 (Tue, 06 Sep 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: vat dictionary should allow enter and edit multiple values for
localtaxes, separated by: (ex -19:-15)
Commit: 972a2db3a365752d958ade11ef24083c1e5f9653
https://github.com/Dolibarr/dolibarr/commit/972a2db3a365752d958ade11ef24083c1e5f9653
Author: Philippe <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
No initialisation of the array before filling it. May cause some trouble
when fetch is call several times and lines added or deleted
Commit: b72794216eb611bcd001fe2575f5045d37c6e3f9
https://github.com/Dolibarr/dolibarr/commit/b72794216eb611bcd001fe2575f5045d37c6e3f9
Author: Juanjo Menent <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
Merge pull request #5702 from simnandez/3.8
FIX: vat dictionary should allow enter and edit multiple values for localtaxes,
separated by: (ex -19:-15)
Commit: ff632718fa7bc7d217cb86548fbbde7e2587eead
https://github.com/Dolibarr/dolibarr/commit/ff632718fa7bc7d217cb86548fbbde7e2587eead
Author: Juanjo Menent <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Merge pull request #5719 from philippe-opendsi/3.8_patch_1
FIX #5705 Supplier Order's lines array initalisation
Commit: e3c2299c674a61dd182dcae3d4bb4abbf997cbea
https://github.com/Dolibarr/dolibarr/commit/e3c2299c674a61dd182dcae3d4bb4abbf997cbea
Author: Juanjo Menent <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/admin/dict.php
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.8' into 3.9
Conflicts:
htdocs/admin/dict.php
htdocs/fourn/class/fournisseur.commande.class.php
Commit: d8f50f9acdf5d235bb5a9c51a09115081bd844db
https://github.com/Dolibarr/dolibarr/commit/d8f50f9acdf5d235bb5a9c51a09115081bd844db
Author: Juanjo Menent <address@hidden>
Date: 2016-09-09 (Fri, 09 Sep 2016)
Changed paths:
M htdocs/admin/dict.php
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.9' into 4.0
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/efde12b489d1...d8f50f9acdf5