[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 38584f: Fix shipment validation 2 tim
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 38584f: Fix shipment validation 2 times qty in SQL select |
|
Date: |
Thu, 20 Aug 2015 05:40:06 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 38584f2cfacd21161973fc465e68e1936f46d09c
https://github.com/Dolibarr/dolibarr/commit/38584f2cfacd21161973fc465e68e1936f46d09c
Author: fappels <address@hidden>
Date: 2015-08-19 (Wed, 19 Aug 2015)
Changed paths:
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Fix shipment validation 2 times qty in SQL select
Commit: 3743c7460de7c73bacbc65de03ad60a4de14899c
https://github.com/Dolibarr/dolibarr/commit/3743c7460de7c73bacbc65de03ad60a4de14899c
Author: philippe grand <address@hidden>
Date: 2015-08-19 (Wed, 19 Aug 2015)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
FIX : pdf_writeLinkedObjects use foreach instead of for($i..) because
now linked objects return by fetchLinkedObject are associative array
with ID as key.
Commit: ac6d2b47d43db7f50633ac106d7333ccad9f3422
https://github.com/Dolibarr/dolibarr/commit/ac6d2b47d43db7f50633ac106d7333ccad9f3422
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-20 (Thu, 20 Aug 2015)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Merge pull request #3398 from grandoc/3.8
FIX : pdf_writeLinkedObjects use foreach instead of for($i..) because now
linked objects return by fetchLinkedObject are associative array with ID as key.
Commit: 2266c2806f328a7459467954a4e53a95cb6c40ef
https://github.com/Dolibarr/dolibarr/commit/2266c2806f328a7459467954a4e53a95cb6c40ef
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-20 (Thu, 20 Aug 2015)
Changed paths:
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Merge pull request #3396 from fappels/3.8
Fix shipment validation: 2 times qty in SQL select
Commit: e24fd6fa37efecfbe30964276c4b4287ead6ec7d
https://github.com/Dolibarr/dolibarr/commit/e24fd6fa37efecfbe30964276c4b4287ead6ec7d
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-20 (Thu, 20 Aug 2015)
Changed paths:
M ChangeLog
M build/debian/README.howto
M htdocs/admin/tools/listevents.php
M htdocs/comm/askpricesupplier/index.php
M htdocs/comm/mailing/list.php
M htdocs/comm/propal/index.php
M htdocs/comm/prospect/index.php
M htdocs/commande/index.php
M htdocs/compta/bank/categ.php
M htdocs/compta/bank/ligne.php
M htdocs/compta/facture/mergepdftool.php
M htdocs/contact/list.php
M htdocs/contrat/services.php
M htdocs/core/boxes/box_contacts.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/modules/project/doc/pdf_baleine.modules.php
M htdocs/core/modules/project/doc/pdf_beluga.modules.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/index.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/commande/index.php
M htdocs/fourn/commande/orderstoinvoice.php
M htdocs/langs/en_US/projects.lang
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
Log Message:
-----------
Merge remote-tracking branch 'origin/develop' into 3.8
Conflicts:
htdocs/expedition/class/expedition.class.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/d90b342cc9b1...e24fd6fa37ef