[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 4649cf: Fix: [ bug #3206 ] PropaleLig
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 4649cf: Fix: [ bug #3206 ] PropaleLigne, OrderLine and Fac... |
Date: |
Wed, 12 Aug 2015 19:06:51 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 4649cf72105f646ab76e5fa2a626399a742dbf17
https://github.com/Dolibarr/dolibarr/commit/4649cf72105f646ab76e5fa2a626399a742dbf17
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-07-18 (Sat, 18 Jul 2015)
Changed paths:
M ChangeLog
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Fix: [ bug #3206 ] PropaleLigne, OrderLine and FactureLigne given to triggers
through update function does not contain all the information
Close #3206
Commit: d0b1652efd05b97e8682eadf0f5f66199f988250
https://github.com/Dolibarr/dolibarr/commit/d0b1652efd05b97e8682eadf0f5f66199f988250
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-07-19 (Sun, 19 Jul 2015)
Changed paths:
M ChangeLog
M htdocs/compta/facture/stats/index.php
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Merge branch '3.5' into bug-3206
Conflicts:
ChangeLog
Commit: cc8eac67d95feeabfc5fec175773b619923a9411
https://github.com/Dolibarr/dolibarr/commit/cc8eac67d95feeabfc5fec175773b619923a9411
Author: Gauthier <address@hidden>
Date: 2015-07-29 (Wed, 29 Jul 2015)
Changed paths:
M htdocs/contact/vcard.php
Log Message:
-----------
FIX : Display country name instead of country id (display country id makes no
sense on vcard files)
Commit: 9e05cecc1a2459796cda049b2e4567f2685baf34
https://github.com/Dolibarr/dolibarr/commit/9e05cecc1a2459796cda049b2e4567f2685baf34
Author: Maxime Kohlhaas <address@hidden>
Date: 2015-07-31 (Fri, 31 Jul 2015)
Changed paths:
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Fix : rowid was missing on expedition line so no origin id when creating an
invoice
Commit: a1f74763da692faf1da20b91e21727819226ead5
https://github.com/Dolibarr/dolibarr/commit/a1f74763da692faf1da20b91e21727819226ead5
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-08-03 (Mon, 03 Aug 2015)
Changed paths:
M ChangeLog
M htdocs/comm/propal/class/propal.class.php
M htdocs/contact/exportimport.php
M htdocs/contact/info.php
M htdocs/contact/ldap.php
M htdocs/contact/perso.php
M htdocs/contact/vcard.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/societe/info.php
M htdocs/societe/soc.php
Log Message:
-----------
Merge branch '3.5' into bug-3206
Conflicts:
ChangeLog
Commit: e13515e59f5f8310dc124269b2f3dfb0b1959737
https://github.com/Dolibarr/dolibarr/commit/e13515e59f5f8310dc124269b2f3dfb0b1959737
Author: Maxime Kohlhaas <address@hidden>
Date: 2015-08-06 (Thu, 06 Aug 2015)
Changed paths:
M htdocs/compta/bank/fiche.php
Log Message:
-----------
Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6
Commit: 7cb564586ea3033fabb92c61756f51722bd287ce
https://github.com/Dolibarr/dolibarr/commit/7cb564586ea3033fabb92c61756f51722bd287ce
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-08-09 (Sun, 09 Aug 2015)
Changed paths:
M ChangeLog
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Fix: [ bug #3310 ] OrderLine::fetch, FactureLigne::fetch and
PropaleLigne::fetch do not return anything
Close #3310
Commit: f3ef4fed93cc45bc310b54810ff0198b4121038c
https://github.com/Dolibarr/dolibarr/commit/f3ef4fed93cc45bc310b54810ff0198b4121038c
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-08-09 (Sun, 09 Aug 2015)
Changed paths:
M ChangeLog
M htdocs/core/class/menubase.class.php
M htdocs/core/modules/DolibarrModules.class.php
Log Message:
-----------
Fix: [ bug #3313 ] Error enabling module with PostgreSQL database
Close #3313
Commit: 2f6587b48ecc8c1554f2194503796c0f034909be
https://github.com/Dolibarr/dolibarr/commit/2f6587b48ecc8c1554f2194503796c0f034909be
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-08-09 (Sun, 09 Aug 2015)
Changed paths:
M ChangeLog
M htdocs/societe/class/societe.class.php
Log Message:
-----------
FIX [ bug #3211 ] Error about sold to pay (Montant encours)
Close #3211
Commit: 202d12ffef3e3bb64237382730e54aa8c155fa96
https://github.com/Dolibarr/dolibarr/commit/202d12ffef3e3bb64237382730e54aa8c155fa96
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-08-10 (Mon, 10 Aug 2015)
Changed paths:
M ChangeLog
M htdocs/compta/paiement_charge.php
M htdocs/core/boxes/box_task.php
M htdocs/langs/en_US/bills.lang
Log Message:
-----------
Merge branch '3.7' into bug-3211
# Conflicts:
# ChangeLog
Commit: 02f4e9f5cb8ce908e3b53f37c60f7a406c42014c
https://github.com/Dolibarr/dolibarr/commit/02f4e9f5cb8ce908e3b53f37c60f7a406c42014c
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-08-11 (Tue, 11 Aug 2015)
Changed paths:
M ChangeLog
M build/perl/virtualmin/dolibarr.pl
M htdocs/admin/dict.php
M htdocs/user/card.php
Log Message:
-----------
Merge branch '3.7' into bug-3211
# Conflicts:
# ChangeLog
Commit: d3f004d407a934eaef186f623c1c1834ad29c653
https://github.com/Dolibarr/dolibarr/commit/d3f004d407a934eaef186f623c1c1834ad29c653
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M ChangeLog
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Merge pull request #3275 from marcosgdf/bug-3206
Fix: [ bug #3206 ] PropaleLigne, OrderLine and FactureLigne given to triggers
through update function does not contain all the information
Commit: 16ee7b461c1bbefe8d275b234c8f65f573aa4309
https://github.com/Dolibarr/dolibarr/commit/16ee7b461c1bbefe8d275b234c8f65f573aa4309
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M htdocs/contact/vcard.php
Log Message:
-----------
Merge pull request #3332 from
atm-gauthier/3.7_fix_display_country_name_on_vcard
FIX : Display country name instead of country id (display country id …
Commit: 958321b64d6e9ed92c6ef5c03c74197876c67b2a
https://github.com/Dolibarr/dolibarr/commit/958321b64d6e9ed92c6ef5c03c74197876c67b2a
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Merge pull request #3340 from atm-maxime/3.6
Rowid was missing on expedition line so no origin id when creating an invoice
Commit: a8c2dfd445d29a2210d1068b705d9465dc7464ba
https://github.com/Dolibarr/dolibarr/commit/a8c2dfd445d29a2210d1068b705d9465dc7464ba
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-13 (Thu, 13 Aug 2015)
Changed paths:
M ChangeLog
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-3310' into 3.5
Commit: 4b51fc80a6f036696171c6aad9361f977409db66
https://github.com/Dolibarr/dolibarr/commit/4b51fc80a6f036696171c6aad9361f977409db66
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-13 (Thu, 13 Aug 2015)
Changed paths:
M ChangeLog
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Conflicts:
ChangeLog
Commit: dc4b429a3384349b30643ce1ae50ad237d16876f
https://github.com/Dolibarr/dolibarr/commit/dc4b429a3384349b30643ce1ae50ad237d16876f
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-13 (Thu, 13 Aug 2015)
Changed paths:
M ChangeLog
M htdocs/core/class/menubase.class.php
M htdocs/core/modules/DolibarrModules.class.php
Log Message:
-----------
Merge branch 'bug-3313' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-3313
Conflicts:
ChangeLog
Commit: 45aed1e0aae4d8528d7570d5eb7de8c3119f7fea
https://github.com/Dolibarr/dolibarr/commit/45aed1e0aae4d8528d7570d5eb7de8c3119f7fea
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-13 (Thu, 13 Aug 2015)
Changed paths:
M ChangeLog
M htdocs/core/class/menubase.class.php
M htdocs/core/modules/DolibarrModules.class.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-3313' into 3.5
Commit: af2d63d7e5b23d8b2cef1685b92d083d6a4c5a67
https://github.com/Dolibarr/dolibarr/commit/af2d63d7e5b23d8b2cef1685b92d083d6a4c5a67
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-13 (Thu, 13 Aug 2015)
Changed paths:
M ChangeLog
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Merge pull request #3368 from marcosgdf/bug-3211
FIX [ bug #3211 ] Error about sold to pay (Montant encours)
Commit: 1595765ec89708f7608051ca6624e5e6aa2b0c91
https://github.com/Dolibarr/dolibarr/commit/1595765ec89708f7608051ca6624e5e6aa2b0c91
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-13 (Thu, 13 Aug 2015)
Changed paths:
M ChangeLog
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/modules/DolibarrModules.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/compta/facture/class/facture.class.php
Commit: 04812bf4229d08e7e34b3a6222674c67d19aba4a
https://github.com/Dolibarr/dolibarr/commit/04812bf4229d08e7e34b3a6222674c67d19aba4a
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-13 (Thu, 13 Aug 2015)
Changed paths:
M htdocs/resource/card.php
M htdocs/societe/consumption.php
Log Message:
-----------
Fix date not visible and label of edit button not correct
Commit: c73fe965d2c4511f4cac978ebd40a91cd020ad67
https://github.com/Dolibarr/dolibarr/commit/c73fe965d2c4511f4cac978ebd40a91cd020ad67
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-13 (Thu, 13 Aug 2015)
Changed paths:
M ChangeLog
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
Commit: fc8a822f1d9fdfbe96dfb28bb484341299b4a032
https://github.com/Dolibarr/dolibarr/commit/fc8a822f1d9fdfbe96dfb28bb484341299b4a032
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-13 (Thu, 13 Aug 2015)
Changed paths:
M ChangeLog
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/contact/vcard.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/418a609b732a...fc8a822f1d9f
- [Dolibarr-git] [Dolibarr/dolibarr] 4649cf: Fix: [ bug #3206 ] PropaleLigne, OrderLine and Fac..., Laurent Destailleur, 2015/08/12
- [Dolibarr-git] [Dolibarr/dolibarr] 4649cf: Fix: [ bug #3206 ] PropaleLigne, OrderLine and Fac..., Laurent Destailleur, 2015/08/12
- [Dolibarr-git] [Dolibarr/dolibarr] 4649cf: Fix: [ bug #3206 ] PropaleLigne, OrderLine and Fac..., Laurent Destailleur, 2015/08/12
- [Dolibarr-git] [Dolibarr/dolibarr] 4649cf: Fix: [ bug #3206 ] PropaleLigne, OrderLine and Fac..., Laurent Destailleur, 2015/08/12
- [Dolibarr-git] [Dolibarr/dolibarr] 4649cf: Fix: [ bug #3206 ] PropaleLigne, OrderLine and Fac..., Laurent Destailleur, 2015/08/12
- [Dolibarr-git] [Dolibarr/dolibarr] 4649cf: Fix: [ bug #3206 ] PropaleLigne, OrderLine and Fac...,
Laurent Destailleur <=
- [Dolibarr-git] [Dolibarr/dolibarr] 4649cf: Fix: [ bug #3206 ] PropaleLigne, OrderLine and Fac..., Laurent Destailleur, 2015/08/12