[Dolibarr-git] [Dolibarr/dolibarr] 4649cf: Fix: [ bug #3206 ] PropaleLigne, OrderLine and Fac...

[Laurent Destailleur]

  Branch: refs/heads/3.6_backported
  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: 3b9c8a685b42d638d7c7185218a26350bb41cbf5
      
https://github.com/Dolibarr/dolibarr/commit/3b9c8a685b42d638d7c7185218a26350bb41cbf5
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-07-29 (Wed, 29 Jul 2015)

  Changed paths:
    M htdocs/compta/bank/fiche.php

  Log Message:
  -----------
  Fix #3314 Display state in bank account card


  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: 22b4bfd1a4c984dd0d83a3424dcc9dd6068b7900
      
https://github.com/Dolibarr/dolibarr/commit/22b4bfd1a4c984dd0d83a3424dcc9dd6068b7900
  Author: Juanjo Menent <address@hidden>
  Date:   2015-08-01 (Sat, 01 Aug 2015)

  Changed paths:
    M htdocs/compta/bank/fiche.php

  Log Message:
  -----------
  Merge pull request #3334 from GPCsolutions/3.6-3314

Fix #3314 Display state in bank account card


  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: a24f29ba8bea857787f013c054f1de75df6762b6
      
https://github.com/Dolibarr/dolibarr/commit/a24f29ba8bea857787f013c054f1de75df6762b6
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-08-09 (Sun, 09 Aug 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/paiement_charge.php

  Log Message:
  -----------
  Fix [ bug #3341 ]: Missing translation in /compta/paiement_charge.php

Close #3341


  Commit: 2f921b643119158db9330afaeb8274c805378cbf
      
https://github.com/Dolibarr/dolibarr/commit/2f921b643119158db9330afaeb8274c805378cbf
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-08-09 (Sun, 09 Aug 2015)

  Changed paths:
    M ChangeLog
    M htdocs/admin/dict.php

  Log Message:
  -----------
  Fix [ bug #3342 ]: Taxes dictionary page does not accept localized decimals 
for localtax2 rate

Close #3342


  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: 804aec3cbc51b0cccf0ce0cbcd2373170c3ee708
      
https://github.com/Dolibarr/dolibarr/commit/804aec3cbc51b0cccf0ce0cbcd2373170c3ee708
  Author: Juanjo Menent <address@hidden>
  Date:   2015-08-10 (Mon, 10 Aug 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/paiement_charge.php

  Log Message:
  -----------
  Merge pull request #3362 from marcosgdf/bug-3341

Fix [ bug #3341 ]: Missing translation in /compta/paiement_charge.php


  Commit: e2797ddd408d85f5d317d610de5e3e0b37dc00bc
      
https://github.com/Dolibarr/dolibarr/commit/e2797ddd408d85f5d317d610de5e3e0b37dc00bc
  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

  Log Message:
  -----------
  Merge branch '3.6' into bug-3342

# Conflicts:
#       ChangeLog


  Commit: 374f702ef0829d0a6078fa2f1603c24652c6d4ba
      
https://github.com/Dolibarr/dolibarr/commit/374f702ef0829d0a6078fa2f1603c24652c6d4ba
  Author: Juanjo Menent <address@hidden>
  Date:   2015-08-10 (Mon, 10 Aug 2015)

  Changed paths:
    M ChangeLog
    M htdocs/admin/dict.php

  Log Message:
  -----------
  Merge pull request #3363 from marcosgdf/bug-3342

Fix [ bug #3342 ]: Taxes dictionary page does not accept localized decimals for 
localtax2 rate


  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: 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: 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: 0c9072370cc1eebe7a8ee1c2cd30a61d0d59f0b3
      
https://github.com/Dolibarr/dolibarr/commit/0c9072370cc1eebe7a8ee1c2cd30a61d0d59f0b3
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-08-13 (Thu, 13 Aug 2015)

  Changed paths:
    M ChangeLog
    M htdocs/admin/dict.php
    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/bank/fiche.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/paiement_charge.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.6_backported

Conflicts:
        htdocs/expedition/class/expedition.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/a077dd6cadda...0c9072370cc1