[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] f3ef9b: fix entities warehouse share
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] f3ef9b: fix entities warehouse share |
|
Date: |
Fri, 13 Nov 2015 02:23:10 -0800 |
Branch: refs/heads/3.6_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: f3ef9b868f9c4a25189479cc6fe21e0ebfaee39d
https://github.com/Dolibarr/dolibarr/commit/f3ef9b868f9c4a25189479cc6fe21e0ebfaee39d
Author: Christophe Battarel <address@hidden>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M htdocs/product/class/product.class.php
M htdocs/product/stock/class/entrepot.class.php
Log Message:
-----------
fix entities warehouse share
Commit: 00f0aff6f0cead68aa186b5c704b564b27d04ed2
https://github.com/Dolibarr/dolibarr/commit/00f0aff6f0cead68aa186b5c704b564b27d04ed2
Author: Christophe Battarel <address@hidden>
Date: 2015-10-08 (Thu, 08 Oct 2015)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
FIX: change order date on clone (as everywhere else)
Commit: e886c89e063e9307ca2e8475f53c3d9e24e4b217
https://github.com/Dolibarr/dolibarr/commit/e886c89e063e9307ca2e8475f53c3d9e24e4b217
Author: Laurent Destailleur <address@hidden>
Date: 2015-10-09 (Fri, 09 Oct 2015)
Changed paths:
M htdocs/product/class/product.class.php
M htdocs/product/stock/class/entrepot.class.php
Log Message:
-----------
Merge pull request #3668 from altatof/fix_stock_entity
fix entities warehouse share
Commit: 384c89dcef32c4c17832e7aaf93e985cdfbee428
https://github.com/Dolibarr/dolibarr/commit/384c89dcef32c4c17832e7aaf93e985cdfbee428
Author: Laurent Destailleur <address@hidden>
Date: 2015-10-09 (Fri, 09 Oct 2015)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Merge pull request #3701 from altatof/fix_orderdateonclone
FIX: change order date on clone (as everywhere else)
Commit: c06c2d0464925ff0fe8c8982b434b23a2afd4a7a
https://github.com/Dolibarr/dolibarr/commit/c06c2d0464925ff0fe8c8982b434b23a2afd4a7a
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-02 (Mon, 02 Nov 2015)
Changed paths:
M htdocs/core/lib/company.lib.php
Log Message:
-----------
FIX #3841 creation of a task completed has not status set to finished by
default
Commit: 69ac75bef8570112e0ce94e03b2f70805042e35d
https://github.com/Dolibarr/dolibarr/commit/69ac75bef8570112e0ce94e03b2f70805042e35d
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-11-04 (Wed, 04 Nov 2015)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
Fix #3864 Fixed invalid jQuery code
Commit: fb34f257013b59cb5362e16eb887f3060a8c18a9
https://github.com/Dolibarr/dolibarr/commit/fb34f257013b59cb5362e16eb887f3060a8c18a9
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-05 (Thu, 05 Nov 2015)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
Merge pull request #3887 from GPCsolutions/dolibarr-3864
Fix #3864 Fixed invalid jQuery code
Commit: 9b797c1831932ef0bd0c1ddacbba2535070c2a0b
https://github.com/Dolibarr/dolibarr/commit/9b797c1831932ef0bd0c1ddacbba2535070c2a0b
Author: Christophe Battarel <address@hidden>
Date: 2015-11-05 (Thu, 05 Nov 2015)
Changed paths:
M htdocs/product/stock/class/entrepot.class.php
M htdocs/product/stock/fiche.php
M htdocs/product/stock/valo.php
Log Message:
-----------
FIX bad calculation for stock value
Commit: b0cf9bd0bebafdaebfe20cc02c4549b5cae1b357
https://github.com/Dolibarr/dolibarr/commit/b0cf9bd0bebafdaebfe20cc02c4549b5cae1b357
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-11-05 (Thu, 05 Nov 2015)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
Fix #3864 Really fixed invalid jQuery code
Commit: fa088eb6cc23185e09bbfa18cd1c53afbebd33b9
https://github.com/Dolibarr/dolibarr/commit/fa088eb6cc23185e09bbfa18cd1c53afbebd33b9
Author: Christophe Battarel <address@hidden>
Date: 2015-11-05 (Thu, 05 Nov 2015)
Changed paths:
M htdocs/product/stock/class/entrepot.class.php
M htdocs/product/stock/fiche.php
M htdocs/product/stock/valo.php
Log Message:
-----------
FIX bad calculation for stock value
Commit: f566b382969841bd32b0d7ba314c73d3e80ecc86
https://github.com/Dolibarr/dolibarr/commit/f566b382969841bd32b0d7ba314c73d3e80ecc86
Author: Christophe Battarel <address@hidden>
Date: 2015-11-05 (Thu, 05 Nov 2015)
Changed paths:
M htdocs/product/stock/product.php
Log Message:
-----------
FIX pmp
Commit: 75bcb7e53f2dcb3b71cd7c4e8712b473a36ac2e8
https://github.com/Dolibarr/dolibarr/commit/75bcb7e53f2dcb3b71cd7c4e8712b473a36ac2e8
Author: Christophe Battarel <address@hidden>
Date: 2015-11-05 (Thu, 05 Nov 2015)
Changed paths:
M htdocs/product/stock/product.php
Log Message:
-----------
fix pmp
Commit: ad821358790e17aa2619b3f2aad87be5ad74130a
https://github.com/Dolibarr/dolibarr/commit/ad821358790e17aa2619b3f2aad87be5ad74130a
Author: Christophe Battarel <address@hidden>
Date: 2015-11-05 (Thu, 05 Nov 2015)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
FIX: change order date on clone (as everywhere else)
Commit: 80d24455402b65b1519fad1c9f12093b829e5690
https://github.com/Dolibarr/dolibarr/commit/80d24455402b65b1519fad1c9f12093b829e5690
Author: Christophe Battarel <address@hidden>
Date: 2015-11-05 (Thu, 05 Nov 2015)
Changed paths:
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
FIX: bad stock valorisation
Commit: 316b7453e47d247ca0af2ae56d8b12bafd86e7b1
https://github.com/Dolibarr/dolibarr/commit/316b7453e47d247ca0af2ae56d8b12bafd86e7b1
Author: Christophe Battarel <address@hidden>
Date: 2015-11-05 (Thu, 05 Nov 2015)
Changed paths:
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
FIX bad stock valo
Commit: 60debe31c42f1fa913d29e845b173b28c4c3f8c2
https://github.com/Dolibarr/dolibarr/commit/60debe31c42f1fa913d29e845b173b28c4c3f8c2
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-05 (Thu, 05 Nov 2015)
Changed paths:
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/product/stock/class/entrepot.class.php
M htdocs/product/stock/fiche.php
M htdocs/product/stock/product.php
M htdocs/product/stock/valo.php
Log Message:
-----------
Merge pull request #3894 from altatof/stockvalue
FIX bad calculation for stock value
Commit: d499fafdb9b3db5d083aff4104370b7d64a8066d
https://github.com/Dolibarr/dolibarr/commit/d499fafdb9b3db5d083aff4104370b7d64a8066d
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-05 (Thu, 05 Nov 2015)
Changed paths:
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/product/stock/class/entrepot.class.php
M htdocs/product/stock/fiche.php
M htdocs/product/stock/product.php
M htdocs/product/stock/valo.php
Log Message:
-----------
Merge pull request #3901 from altatof/3.6
FIX bad calculation for stock value
Commit: fdf9617e42056daf8d47538ca8806871b96422c5
https://github.com/Dolibarr/dolibarr/commit/fdf9617e42056daf8d47538ca8806871b96422c5
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-05 (Thu, 05 Nov 2015)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
Merge pull request #3900 from GPCsolutions/dolibarr-3864
Fix #3864 Really fixed invalid jQuery code
Commit: 5777c16b7255a54f270d48be403a4657e05a3b0f
https://github.com/Dolibarr/dolibarr/commit/5777c16b7255a54f270d48be403a4657e05a3b0f
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-05 (Thu, 05 Nov 2015)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Merge pull request #3902 from altatof/clonedorderdate
FIX: change order date on clone (as everywhere else)
Commit: 375e61de2ec37b7f9236de61a20416530344820e
https://github.com/Dolibarr/dolibarr/commit/375e61de2ec37b7f9236de61a20416530344820e
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-05 (Thu, 05 Nov 2015)
Log Message:
-----------
Merge 3.5
Commit: 4d11205a01f056dd1a0dd2baf1223e35ef953d60
https://github.com/Dolibarr/dolibarr/commit/4d11205a01f056dd1a0dd2baf1223e35ef953d60
Author: Christophe Battarel <address@hidden>
Date: 2015-11-06 (Fri, 06 Nov 2015)
Changed paths:
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
FIX: change object statut on close shipping and remove erratic db commit
Commit: f33157033c26f4d85b23ee0f718b069f74b74bd2
https://github.com/Dolibarr/dolibarr/commit/f33157033c26f4d85b23ee0f718b069f74b74bd2
Author: Juanjo Menent <address@hidden>
Date: 2015-11-06 (Fri, 06 Nov 2015)
Changed paths:
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Merge pull request #3909 from altatof/fixcloseshipping
FIX: change object statut on close shipping and remove erratic db commit
Commit: b4c3804c911d458d575ab0ce559e2acbf521ae6b
https://github.com/Dolibarr/dolibarr/commit/b4c3804c911d458d575ab0ce559e2acbf521ae6b
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-11-07 (Sat, 07 Nov 2015)
Changed paths:
M htdocs/commande/fiche.php
M htdocs/compta/facture.php
Log Message:
-----------
FIX #3928 Creating a Customer order and a Customer invoice from a project,
does not inherit payment conditions and method of payment of customer card
Commit: 728f469c1e37e9cec1f22686461f8eedf48e8d12
https://github.com/Dolibarr/dolibarr/commit/728f469c1e37e9cec1f22686461f8eedf48e8d12
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-11-07 (Sat, 07 Nov 2015)
Changed paths:
M htdocs/compta/bank/treso.php
Log Message:
-----------
FIX #3890 Expected transactions bank account page, shows negative numbers
Commit: d69e76168f2e464e831126e5448b3020d1acad04
https://github.com/Dolibarr/dolibarr/commit/d69e76168f2e464e831126e5448b3020d1acad04
Author: Juanjo Menent <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M htdocs/commande/fiche.php
M htdocs/compta/facture.php
Log Message:
-----------
Merge pull request #3929 from marcosgdf/bug-3928
FIX #3928 Creating a Customer order and a Customer invoice from a project, does
not inherit payment conditions and method of payment of customer card
Commit: a6f0baefc108a5a5ec9532750f9abe46897999ba
https://github.com/Dolibarr/dolibarr/commit/a6f0baefc108a5a5ec9532750f9abe46897999ba
Author: Juanjo Menent <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M htdocs/compta/bank/treso.php
Log Message:
-----------
Merge pull request #3933 from marcosgdf/bug-3980
FIX #3890 Expected transactions bank account page, shows negative numbers
Commit: d4aeb8b3bcea0e212de82f2ade1070f56a262088
https://github.com/Dolibarr/dolibarr/commit/d4aeb8b3bcea0e212de82f2ade1070f56a262088
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Abandon package APS. Was never used.
Commit: 722a133b314807bd08b9a0d59c0614f6b0599d7f
https://github.com/Dolibarr/dolibarr/commit/722a133b314807bd08b9a0d59c0614f6b0599d7f
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
Log Message:
-----------
FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.6.5
Conflicts:
ChangeLog
Conflicts:
ChangeLog
Commit: 350345eccaa70ac932f7ddaa94e6f217f01bef6e
https://github.com/Dolibarr/dolibarr/commit/350345eccaa70ac932f7ddaa94e6f217f01bef6e
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M build/debian/changelog
Log Message:
-----------
Prepare 3.6.5
Commit: 96d889b1654088082f5d12fca89a480a7e7a4d46
https://github.com/Dolibarr/dolibarr/commit/96d889b1654088082f5d12fca89a480a7e7a4d46
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-13 (Fri, 13 Nov 2015)
Changed paths:
M ChangeLog
M build/debian/changelog
M build/makepack-dolibarr.pl
M htdocs/commande/class/commande.class.php
M htdocs/commande/fiche.php
M htdocs/compta/bank/treso.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/expedition/class/expedition.class.php
M htdocs/product/stock/class/entrepot.class.php
M htdocs/product/stock/fiche.php
M htdocs/product/stock/product.php
M htdocs/product/stock/valo.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.6_backported
Compare:
https://github.com/Dolibarr/dolibarr/compare/0b5188db6547...96d889b16540