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

[Laurent Destailleur]

  Branch: refs/heads/3.7_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: 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: 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: 2a67bd1f38ec0cee3a99e91d7caef476efe92352
      
https://github.com/Dolibarr/dolibarr/commit/2a67bd1f38ec0cee3a99e91d7caef476efe92352
  Author: Juanjo Menent <address@hidden>
  Date:   2015-08-01 (Sat, 01 Aug 2015)

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

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


  Commit: 2cf9d9f5834f417ba43fde15bc56b343e43f2814
      
https://github.com/Dolibarr/dolibarr/commit/2cf9d9f5834f417ba43fde15bc56b343e43f2814
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-08-03 (Mon, 03 Aug 2015)

  Changed paths:
    M htdocs/core/lib/functions.lib.php
    M test/phpunit/FunctionsLibTest.php

  Log Message:
  -----------
  Fix #3322 Use title for alt if no alt is provided

alt has priority over title, so it should be filled if title is filled.
Use the title value to fill alt.
Unit test updated accordingly.


  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: 62ad7d4d3419dfc3d6c0583d6b6ca86f0cf1981f
      
https://github.com/Dolibarr/dolibarr/commit/62ad7d4d3419dfc3d6c0583d6b6ca86f0cf1981f
  Author: fmarcet <address@hidden>
  Date:   2015-08-04 (Tue, 04 Aug 2015)

  Changed paths:
    M ChangeLog
    M htdocs/projet/tasks.php

  Log Message:
  -----------
  FIX: Not showing task extrafields when creating from left menu


  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: 46a9381f0ba81c4c66bfdc01829782010400cab8
      
https://github.com/Dolibarr/dolibarr/commit/46a9381f0ba81c4c66bfdc01829782010400cab8
  Author: Juanjo Menent <address@hidden>
  Date:   2015-08-06 (Thu, 06 Aug 2015)

  Changed paths:
    M htdocs/core/lib/functions.lib.php
    M test/phpunit/FunctionsLibTest.php

  Log Message:
  -----------
  Merge pull request #3335 from GPCsolutions/3.7-3322

Fix #3322 Use title for alt if no alt is provided


  Commit: 63f62a1fa2fffaa5b204109ba927b3a49669a441
      
https://github.com/Dolibarr/dolibarr/commit/63f62a1fa2fffaa5b204109ba927b3a49669a441
  Author: Juanjo Menent <address@hidden>
  Date:   2015-08-06 (Thu, 06 Aug 2015)

  Changed paths:
    M ChangeLog
    M htdocs/projet/tasks.php

  Log Message:
  -----------
  Merge pull request #3344 from fmarcet/3.7

FIX: Not showing task extrafields when creating from left menu


  Commit: 12b83fd3e8ec3ee5b79f6ce52469c5504dec193d
      
https://github.com/Dolibarr/dolibarr/commit/12b83fd3e8ec3ee5b79f6ce52469c5504dec193d
  Author: Juanjo Menent <address@hidden>
  Date:   2015-08-07 (Fri, 07 Aug 2015)

  Changed paths:
    M htdocs/core/modules/modBarcode.class.php

  Log Message:
  -----------
  Fix #3304


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

  Changed paths:
    M ChangeLog
    M htdocs/core/boxes/box_task.php

  Log Message:
  -----------
  Fix: [ bug #3288 ] Tasks box is not properly drawn

Close #3288


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

  Changed paths:
    M htdocs/langs/en_US/bills.lang

  Log Message:
  -----------
  Fix [ bug #3286 ]: Payment types are not translated to English

Close #3286


  Commit: 94ac0f53057143f925033e9054faabac536663b0
      
https://github.com/Dolibarr/dolibarr/commit/94ac0f53057143f925033e9054faabac536663b0
  Author: Regis Houssin <address@hidden>
  Date:   2015-08-09 (Sun, 09 Aug 2015)

  Changed paths:
    M build/perl/virtualmin/dolibarr.pl

  Log Message:
  -----------
  Fix: remove custom dir creation


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

  Changed paths:
    M htdocs/user/card.php

  Log Message:
  -----------
  Fixed minor problem with error alert when creating user


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

  Changed paths:
    M ChangeLog
    M htdocs/core/boxes/box_task.php

  Log Message:
  -----------
  Merge pull request #3359 from marcosgdf/bug-3288

Fix: [ bug #3288 ] Tasks box is not properly drawn


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

  Changed paths:
    M htdocs/langs/en_US/bills.lang

  Log Message:
  -----------
  Merge pull request #3360 from marcosgdf/bug-3286

Fix [ bug #3286 ]: Payment types are not translated to English


  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: 9374b4f3e3638e443fa5dee4d994441cdeacd12b
      
https://github.com/Dolibarr/dolibarr/commit/9374b4f3e3638e443fa5dee4d994441cdeacd12b
  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 remote-tracking branch 'origin/3.6' into 3.7


  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: 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: b3f3cdda3a12c3c00f154821206aa6fe6b1c2e8f
      
https://github.com/Dolibarr/dolibarr/commit/b3f3cdda3a12c3c00f154821206aa6fe6b1c2e8f
  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 remote-tracking branch 'origin/3.6' into 3.7


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

  Changed paths:
    M htdocs/user/card.php

  Log Message:
  -----------
  Merge pull request #3369 from marcosgdf/minor

Fixed minor problem with error alert when creating user


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

  Changed paths:
    M build/perl/virtualmin/dolibarr.pl

  Log Message:
  -----------
  Merge pull request #3361 from hregis/3.7_bug

Fix: remove custom dir creation and update script


  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: ebe496972338d41a0e364aa854d5a025affc7a96
      
https://github.com/Dolibarr/dolibarr/commit/ebe496972338d41a0e364aa854d5a025affc7a96
  Author: Regis Houssin <address@hidden>
  Date:   2015-08-11 (Tue, 11 Aug 2015)

  Changed paths:
    M htdocs/core/class/stats.class.php

  Log Message:
  -----------
  Fix: missing entity in cache files names


  Commit: e146af3118a34cd1d392dbd956d5f13b2f0b7f36
      
https://github.com/Dolibarr/dolibarr/commit/e146af3118a34cd1d392dbd956d5f13b2f0b7f36
  Author: josemariagomezroncero <address@hidden>
  Date:   2015-08-11 (Tue, 11 Aug 2015)

  Changed paths:
    M htdocs/install/mysql/tables/llx_c_type_resource.sql

  Log Message:
  -----------
  Update llx_c_type_resource.sql

Error create table, missing incremet type element


  Commit: 5039db3ebf818f4b36d722c46c0c230a33ca3fad
      
https://github.com/Dolibarr/dolibarr/commit/5039db3ebf818f4b36d722c46c0c230a33ca3fad
  Author: Juanjo Menent <address@hidden>
  Date:   2015-08-12 (Wed, 12 Aug 2015)

  Changed paths:
    M htdocs/install/mysql/tables/llx_c_type_resource.sql

  Log Message:
  -----------
  Merge pull request #3375 from josemariagomezroncero/patch-1

Update llx_c_type_resource.sql


  Commit: e4a9ca8b45bccfcb765d23510078464b6160348b
      
https://github.com/Dolibarr/dolibarr/commit/e4a9ca8b45bccfcb765d23510078464b6160348b
  Author: Juanjo Menent <address@hidden>
  Date:   2015-08-12 (Wed, 12 Aug 2015)

  Changed paths:
    M htdocs/core/class/stats.class.php

  Log Message:
  -----------
  Merge pull request #3373 from hregis/3.7_bug

Fix: missing entity in cache files names


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

  Changed paths:
    M ChangeLog
    M build/perl/virtualmin/dolibarr.pl
    M htdocs/admin/dict.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/bank/card.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/paiement_charge.php
    M htdocs/contact/vcard.php
    M htdocs/core/boxes/box_task.php
    M htdocs/core/class/stats.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/modBarcode.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/install/mysql/tables/llx_c_type_resource.sql
    M htdocs/langs/en_US/bills.lang
    M htdocs/projet/tasks.php
    M htdocs/societe/class/societe.class.php
    M htdocs/user/card.php
    M test/phpunit/FunctionsLibTest.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.7' into 3.7_backported


Compare: 
https://github.com/Dolibarr/dolibarr/compare/bbc8433f557d...f699c6bfc138