[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 1ab695: FIX: dont remove price ht if
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 1ab695: FIX: dont remove price ht if it is forced (ie: cal... |
|
Date: |
Mon, 05 Jan 2015 15:34:43 -0800 |
Branch: refs/heads/3.7
Home: https://github.com/Dolibarr/dolibarr
Commit: 1ab6955494849e57cad898585082f7be18b3f021
https://github.com/Dolibarr/dolibarr/commit/1ab6955494849e57cad898585082f7be18b3f021
Author: Christophe Battarel <address@hidden>
Date: 2014-12-27 (Sat, 27 Dec 2014)
Changed paths:
M htdocs/comm/propal.php
M htdocs/commande/fiche.php
M htdocs/compta/facture.php
Log Message:
-----------
FIX: dont remove price ht if it is forced (ie: calculated by margin rate
and cost price, or by external module)
Commit: 191d4467e358274a77e21f821838924170fd99f3
https://github.com/Dolibarr/dolibarr/commit/191d4467e358274a77e21f821838924170fd99f3
Author: BENKE Charles <address@hidden>
Date: 2014-12-28 (Sun, 28 Dec 2014)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Update facture.php
$soc already filled upper when $socid send
Commit: 337d0558726a9e20485b5547b32100dc9352446a
https://github.com/Dolibarr/dolibarr/commit/337d0558726a9e20485b5547b32100dc9352446a
Author: Laurent Destailleur <address@hidden>
Date: 2015-01-06 (Tue, 06 Jan 2015)
Changed paths:
M htdocs/comm/propal.php
M htdocs/commande/fiche.php
M htdocs/compta/facture.php
Log Message:
-----------
Merge pull request #2199 from altatof/3.6
FIX: dont remove price ht if it is forced (ie: calculated by margin rate and
cost price, or by external module)
Commit: e5f81b1fecf5899cdc151ba322ba56d50df55a2f
https://github.com/Dolibarr/dolibarr/commit/e5f81b1fecf5899cdc151ba322ba56d50df55a2f
Author: Laurent Destailleur <address@hidden>
Date: 2015-01-06 (Tue, 06 Jan 2015)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Merge pull request #2202 from defrance69/patch-38
Update facture.php
Commit: a668d163fdbf3cf97ba685b015a2c6ff4b573ef9
https://github.com/Dolibarr/dolibarr/commit/a668d163fdbf3cf97ba685b015a2c6ff4b573ef9
Author: Laurent Destailleur <address@hidden>
Date: 2015-01-06 (Tue, 06 Jan 2015)
Changed paths:
M htdocs/install/mysql/migration/repair.sql
Log Message:
-----------
Repair corrupted data
Commit: 4ce7a27dca9c26f59ea9c902d0a5eaf5b8b782d6
https://github.com/Dolibarr/dolibarr/commit/4ce7a27dca9c26f59ea9c902d0a5eaf5b8b782d6
Author: Laurent Destailleur <address@hidden>
Date: 2015-01-06 (Tue, 06 Jan 2015)
Changed paths:
M htdocs/comm/propal.php
M htdocs/commande/fiche.php
M htdocs/compta/facture.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: 033757aafd3037168f60dba7c6feae308297909d
https://github.com/Dolibarr/dolibarr/commit/033757aafd3037168f60dba7c6feae308297909d
Author: Laurent Destailleur <address@hidden>
Date: 2015-01-06 (Tue, 06 Jan 2015)
Changed paths:
M htdocs/comm/propal.php
M htdocs/commande/card.php
M htdocs/compta/facture.php
M htdocs/install/mysql/migration/repair.sql
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/commande/fiche.php
htdocs/compta/facture.php
Commit: 2bf2c8fce7966c800b1c5a8fd181ceeddeef38f7
https://github.com/Dolibarr/dolibarr/commit/2bf2c8fce7966c800b1c5a8fd181ceeddeef38f7
Author: Laurent Destailleur <address@hidden>
Date: 2015-01-06 (Tue, 06 Jan 2015)
Changed paths:
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Restore all requets
Compare:
https://github.com/Dolibarr/dolibarr/compare/b919318b5362...2bf2c8fce796