[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 2147bd: Fix: remove lines with specia
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 2147bd: Fix: remove lines with special code when convert t... |
|
Date: |
Thu, 08 Feb 2018 03:59:06 -0800 |
Branch: refs/heads/7.0
Home: https://github.com/Dolibarr/dolibarr
Commit: 2147bd23e64da09d96fc2a44395aa4293a2ab427
https://github.com/Dolibarr/dolibarr/commit/2147bd23e64da09d96fc2a44395aa4293a2ab427
Author: Regis Houssin <address@hidden>
Date: 2018-02-02 (Fri, 02 Feb 2018)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Fix: remove lines with special code when convert to reduc
Commit: a161ca37ffe23e530870f5fb83522910d075fff6
https://github.com/Dolibarr/dolibarr/commit/a161ca37ffe23e530870f5fb83522910d075fff6
Author: Regis Houssin <address@hidden>
Date: 2018-02-04 (Sun, 04 Feb 2018)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Fix: use product_type instead special_code
Commit: d5b7184c8d501e6d4e8b83afeed36027eed9a2c6
https://github.com/Dolibarr/dolibarr/commit/d5b7184c8d501e6d4e8b83afeed36027eed9a2c6
Author: Regis Houssin <address@hidden>
Date: 2018-02-04 (Sun, 04 Feb 2018)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Fix: wrong test
Commit: c4277c1e54b766d98f89d6dc6a95cf5c7a3f19d9
https://github.com/Dolibarr/dolibarr/commit/c4277c1e54b766d98f89d6dc6a95cf5c7a3f19d9
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-04 (Sun, 04 Feb 2018)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Merge pull request #8128 from hregis/5.0_bug
Fix: remove lines with special code when convert to reduc
Commit: 839de650121b330daed69476aec3baae58b2a68f
https://github.com/Dolibarr/dolibarr/commit/839de650121b330daed69476aec3baae58b2a68f
Author: Regis Houssin <address@hidden>
Date: 2018-02-05 (Mon, 05 Feb 2018)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Fix: avoid error -1
Commit: 2d4624a1be64b3b97461282f1d5d286ab48d60ed
https://github.com/Dolibarr/dolibarr/commit/2d4624a1be64b3b97461282f1d5d286ab48d60ed
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-05 (Mon, 05 Feb 2018)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge pull request #8134 from hregis/6.0_multicompany
Fix: avoid error -1
Commit: 6254e20c676319e0b29dc2bd5262644270af32dd
https://github.com/Dolibarr/dolibarr/commit/6254e20c676319e0b29dc2bd5262644270af32dd
Author: atm-ph <address@hidden>
Date: 2018-02-07 (Wed, 07 Feb 2018)
Changed paths:
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
Log Message:
-----------
Fix position if module use pdf hook "linkedobjects"
Commit: a26bb2d884220a0093f82f1f7155771bdc89a252
https://github.com/Dolibarr/dolibarr/commit/a26bb2d884220a0093f82f1f7155771bdc89a252
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
M htdocs/fichinter/class/fichinter.class.php
Log Message:
-----------
FIX #8151
Commit: 81563740055c1013167fac574adcfa8bdb9d009c
https://github.com/Dolibarr/dolibarr/commit/81563740055c1013167fac574adcfa8bdb9d009c
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Commit: 414093f94fe352b4fe2998d4ed87f10d3b1be670
https://github.com/Dolibarr/dolibarr/commit/414093f94fe352b4fe2998d4ed87f10d3b1be670
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
Log Message:
-----------
Merge pull request #8155 from atm-ph/fix_6.0_pdf_writelinkedobjects_position
Fix position if module use pdf hook "linkedobjects"
Commit: 2e3bb4a585508de1b5a385923d92007c7262caf4
https://github.com/Dolibarr/dolibarr/commit/2e3bb4a585508de1b5a385923d92007c7262caf4
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Commit: c988d3f1cc3f4b4b9eb712439540e1e739597484
https://github.com/Dolibarr/dolibarr/commit/c988d3f1cc3f4b4b9eb712439540e1e739597484
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/compta/facture.php
Commit: ab21769aa28ef599e3fbe225b84fe0d3e1b4fd06
https://github.com/Dolibarr/dolibarr/commit/ab21769aa28ef599e3fbe225b84fe0d3e1b4fd06
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
M htdocs/compta/facture/card.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/tpl/card_presend.tpl.php
M htdocs/fichinter/class/fichinter.class.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/compta/facture/card.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/879308e0ef5e...ab21769aa28e