dolibarr-git
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] 89a4c5: Added es_CL language


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 89a4c5: Added es_CL language
Date: Wed, 19 Mar 2014 14:29:36 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 89a4c51153846cc32cad413514595f95b4102e87
      
https://github.com/Dolibarr/dolibarr/commit/89a4c51153846cc32cad413514595f95b4102e87
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-03-10 (Mon, 10 Mar 2014)

  Changed paths:
    M ChangeLog
    M htdocs/langs/en_US/languages.lang
    A htdocs/langs/es_CL/admin.lang
    A htdocs/langs/es_CL/agenda.lang
    A htdocs/langs/es_CL/bills.lang
    A htdocs/langs/es_CL/boxes.lang
    A htdocs/langs/es_CL/commercial.lang
    A htdocs/langs/es_CL/companies.lang
    A htdocs/langs/es_CL/compta.lang
    A htdocs/langs/es_CL/ecm.lang
    A htdocs/langs/es_CL/install.lang
    A htdocs/langs/es_CL/main.lang
    A htdocs/langs/es_CL/members.lang
    A htdocs/langs/es_CL/orders.lang
    A htdocs/langs/es_CL/other.lang
    A htdocs/langs/es_CL/products.lang
    A htdocs/langs/es_CL/projects.lang
    A htdocs/langs/es_CL/propal.lang
    A htdocs/langs/es_CL/workflow.lang

  Log Message:
  -----------
  Added es_CL language


  Commit: da5610bf3f99d9cd0e967c2a801e2705bc86c5a7
      
https://github.com/Dolibarr/dolibarr/commit/da5610bf3f99d9cd0e967c2a801e2705bc86c5a7
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-13 (Thu, 13 Mar 2014)

  Changed paths:
    M ChangeLog
    M htdocs/langs/en_US/languages.lang
    A htdocs/langs/es_CL/admin.lang
    A htdocs/langs/es_CL/agenda.lang
    A htdocs/langs/es_CL/bills.lang
    A htdocs/langs/es_CL/boxes.lang
    A htdocs/langs/es_CL/commercial.lang
    A htdocs/langs/es_CL/companies.lang
    A htdocs/langs/es_CL/compta.lang
    A htdocs/langs/es_CL/ecm.lang
    A htdocs/langs/es_CL/install.lang
    A htdocs/langs/es_CL/main.lang
    A htdocs/langs/es_CL/members.lang
    A htdocs/langs/es_CL/orders.lang
    A htdocs/langs/es_CL/other.lang
    A htdocs/langs/es_CL/products.lang
    A htdocs/langs/es_CL/projects.lang
    A htdocs/langs/es_CL/propal.lang
    A htdocs/langs/es_CL/workflow.lang

  Log Message:
  -----------
  Merge branch 'es_CL-language' of https://github.com/marcosgdf/dolibarr
into marcosgdf-es_CL-language

Conflicts:
        ChangeLog


  Commit: c8f63d6160b0c1b43e24b36616b82ef203b6e9e6
      
https://github.com/Dolibarr/dolibarr/commit/c8f63d6160b0c1b43e24b36616b82ef203b6e9e6
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-14 (Fri, 14 Mar 2014)

  Changed paths:
    M build/debian/changelog
    M build/doxygen/dolibarr-doxygen.doxyfile
    M build/exe/doliwamp/doliwamp.iss
    M build/perl/virtualmin/dolibarr.pl
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  Fix: Prepare for 3.5.2


  Commit: 561a1a1aacf1541b4245c04c4f8a9a98dd3f2177
      
https://github.com/Dolibarr/dolibarr/commit/561a1a1aacf1541b4245c04c4f8a9a98dd3f2177
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-14 (Fri, 14 Mar 2014)

  Changed paths:
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/tpl/document_actions_post_headers.tpl.php
    M htdocs/core/tpl/document_actions_pre_headers.tpl.php
    M htdocs/projet/document.php
    M htdocs/projet/tasks/document.php

  Log Message:
  -----------
  Fix: Miscellaneous problems on task tabs (withproject parameter lost and
download fails).


  Commit: f9c48be2a91e160921ed8a4ac33af727eeb36e9b
      
https://github.com/Dolibarr/dolibarr/commit/f9c48be2a91e160921ed8a4ac33af727eeb36e9b
  Author: philippe grand <address@hidden>
  Date:   2014-03-14 (Fri, 14 Mar 2014)

  Changed paths:
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php

  Log Message:
  -----------
  fix : display specimen


  Commit: 317134c29df7928484b131f6ed1c822ba347188e
      
https://github.com/Dolibarr/dolibarr/commit/317134c29df7928484b131f6ed1c822ba347188e
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-14 (Fri, 14 Mar 2014)

  Changed paths:
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php

  Log Message:
  -----------
  Merge pull request #1467 from grandoc/3.5

fix : display specimen


  Commit: e7791a3ade56b8a642d298070537765e66640c61
      
https://github.com/Dolibarr/dolibarr/commit/e7791a3ade56b8a642d298070537765e66640c61
  Author: bouna <address@hidden>
  Date:   2014-03-14 (Fri, 14 Mar 2014)

  Changed paths:
    M htdocs/comm/prospect/list.php

  Log Message:
  -----------
  Update list.php

to save the town filtre on prospect list, just i replace: 
$param='&amp;stcomm='.$stcomm.'&amp;search_nom='.urlencode($search_nom).'&amp;search_zipcode='.urlencode($search_zipcode).'&amp;search_ville
 ='.urlencode($search_ville );

search_ville by search_town


  Commit: 3f6b319d4107168b239d0c8d0dcf58eaaddc547f
      
https://github.com/Dolibarr/dolibarr/commit/3f6b319d4107168b239d0c8d0dcf58eaaddc547f
  Author: Florian Henry <address@hidden>
  Date:   2014-03-14 (Fri, 14 Mar 2014)

  Changed paths:
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/discount.class.php
    M htdocs/core/modules/modSociete.class.php

  Log Message:
  -----------
  Fix deposit invoice


  Commit: 90cf1ba3a5c4b69a7435a094d69bb1c6910ae620
      
https://github.com/Dolibarr/dolibarr/commit/90cf1ba3a5c4b69a7435a094d69bb1c6910ae620
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M htdocs/comm/prospect/list.php

  Log Message:
  -----------
  Merge pull request #1468 from bouna/patch-1

Update list.php


  Commit: c0f41c84cb4a6f5ee7ac2a935e81d80b28580d46
      
https://github.com/Dolibarr/dolibarr/commit/c0f41c84cb4a6f5ee7ac2a935e81d80b28580d46
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/discount.class.php
    M htdocs/core/modules/modSociete.class.php

  Log Message:
  -----------
  Merge pull request #1471 from FHenry/3.5

Fix deposit invoice


  Commit: 1cb71674d70d58da1515e67c17e82126fd69679e
      
https://github.com/Dolibarr/dolibarr/commit/1cb71674d70d58da1515e67c17e82126fd69679e
  Author: kaos <address@hidden>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M htdocs/holiday/fiche.php

  Log Message:
  -----------
  fixes #1300


  Commit: f55bdc64bd03d708f2d5731bad721de587baa979
      
https://github.com/Dolibarr/dolibarr/commit/f55bdc64bd03d708f2d5731bad721de587baa979
  Author: kaos <address@hidden>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M htdocs/holiday/fiche.php

  Log Message:
  -----------
  fixes #1300


  Commit: 5025d11a16e0a3c817031226f1833fa219872b71
      
https://github.com/Dolibarr/dolibarr/commit/5025d11a16e0a3c817031226f1833fa219872b71
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M htdocs/holiday/fiche.php

  Log Message:
  -----------
  Merge pull request #1476 from tbasilici/3.5

3.5


  Commit: 4db8af8a53ef0cf093e18d884727c189fc243038
      
https://github.com/Dolibarr/dolibarr/commit/4db8af8a53ef0cf093e18d884727c189fc243038
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M scripts/contracts/email_expire_services_to_representatives.php

  Log Message:
  -----------
  Fix: sql syntax error with pgsql


  Commit: 18c4d890ddc468681f6cbffe4baad3f9d22c7bb3
      
https://github.com/Dolibarr/dolibarr/commit/18c4d890ddc468681f6cbffe4baad3f9d22c7bb3
  Author: Florian Henry <address@hidden>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

  Log Message:
  -----------
  Fix [ bug #1283 ] ROUGET Shipment PDF


  Commit: ee70f21f58b3c18d1b07d80d36d27657b49e587a
      
https://github.com/Dolibarr/dolibarr/commit/ee70f21f58b3c18d1b07d80d36d27657b49e587a
  Author: Florian Henry <address@hidden>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M htdocs/holiday/fiche.php
    M scripts/contracts/email_expire_services_to_representatives.php

  Log Message:
  -----------
  Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5


  Commit: 76256294913cd6e515d66f1bef48cdb37cf2f1ad
      
https://github.com/Dolibarr/dolibarr/commit/76256294913cd6e515d66f1bef48cdb37cf2f1ad
  Author: Florian Henry <address@hidden>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php

  Log Message:
  -----------
  Fix [ bug #1294 ] Expedition model Merou having problems with long names


  Commit: 997e16fec7e171299dec07bd75dde66b8371cc57
      
https://github.com/Dolibarr/dolibarr/commit/997e16fec7e171299dec07bd75dde66b8371cc57
  Author: Drosis Nikos <address@hidden>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Update user.class.php

String translated twice


  Commit: 9172beb282a7d89bb6442673247a5a1e29ca5ccc
      
https://github.com/Dolibarr/dolibarr/commit/9172beb282a7d89bb6442673247a5a1e29ca5ccc
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

  Log Message:
  -----------
  Merge pull request #1483 from FHenry/3.5

3.5


  Commit: de59f3aafef1fad082e8b6d3e333b5730f21aa65
      
https://github.com/Dolibarr/dolibarr/commit/de59f3aafef1fad082e8b6d3e333b5730f21aa65
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

  Log Message:
  -----------
  Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5


  Commit: ed4f7fd0837cbf4ac749dc874f593dd4488addf2
      
https://github.com/Dolibarr/dolibarr/commit/ed4f7fd0837cbf4ac749dc874f593dd4488addf2
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-16 (Sun, 16 Mar 2014)

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

  Log Message:
  -----------
  Fix: error


  Commit: eb43bc4982ef3cb131ad948649028d686c4f9b1a
      
https://github.com/Dolibarr/dolibarr/commit/eb43bc4982ef3cb131ad948649028d686c4f9b1a
  Author: Gauthier <address@hidden>
  Date:   2014-03-17 (Mon, 17 Mar 2014)

  Changed paths:
    M htdocs/fourn/commande/fiche.php

  Log Message:
  -----------
  Correction when adding line with price as '0'


  Commit: 6ac7e225211615f70887860266971f9d960eca1d
      
https://github.com/Dolibarr/dolibarr/commit/6ac7e225211615f70887860266971f9d960eca1d
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-17 (Mon, 17 Mar 2014)

  Changed paths:
    M htdocs/fourn/commande/fiche.php

  Log Message:
  -----------
  Merge pull request #1494 from atm-gauthier/3.5

Correction when adding line with price as '0'


  Commit: ada22837a5188c2f1ec3fa79e0256d33a943e7ed
      
https://github.com/Dolibarr/dolibarr/commit/ada22837a5188c2f1ec3fa79e0256d33a943e7ed
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-18 (Tue, 18 Mar 2014)

  Changed paths:
    M htdocs/product/photos.php

  Log Message:
  -----------
  Fix: form to add images should not show link form


  Commit: a05ea581813f7e3abd59c516f7152e992cd47e99
      
https://github.com/Dolibarr/dolibarr/commit/a05ea581813f7e3abd59c516f7152e992cd47e99
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-18 (Tue, 18 Mar 2014)

  Changed paths:
    M htdocs/categories/photos.php

  Log Message:
  -----------
  Fix: form to add images should not show link form


  Commit: dbaea6fa423c3f72c2d554c885379662b1819ae2
      
https://github.com/Dolibarr/dolibarr/commit/dbaea6fa423c3f72c2d554c885379662b1819ae2
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M htdocs/install/mysql/migration/repair.sql

  Log Message:
  -----------
  Add clean sql requests into repair.sql


  Commit: 5d14322679a3f95439be1895a1420fcb203d94d9
      
https://github.com/Dolibarr/dolibarr/commit/5d14322679a3f95439be1895a1420fcb203d94d9
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M htdocs/categories/photos.php
    M htdocs/product/photos.php

  Log Message:
  -----------
  Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5


  Commit: bf735cacbe031c8a0a7d2095fb8ec8fafe93720a
      
https://github.com/Dolibarr/dolibarr/commit/bf735cacbe031c8a0a7d2095fb8ec8fafe93720a
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

  Log Message:
  -----------
  Fix PDF: Page break was ko when breaking 2 pages or more.
Fix PDF: pdf_canelle was missing code to manage pagebreak.
Fix PDF: The width of picture was hardcoded into some templates.
Fix PDF: The atleastonediscount was not used into some templates.


  Commit: 89f0a1bbffc064e553747364834b9f311ea038d3
      
https://github.com/Dolibarr/dolibarr/commit/89f0a1bbffc064e553747364834b9f311ea038d3
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.4' into 3.5


  Commit: 2f101980649c85618cd10971892c9ee272377746
      
https://github.com/Dolibarr/dolibarr/commit/2f101980649c85618cd10971892c9ee272377746
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/project/pdf/pdf_baleine.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

  Log Message:
  -----------
  Fix: Option MAIN_PDF_DASH_BETWEEN_LINES was not working when tcpdf was
making a pagebreak higher than 2 pages.


  Commit: 212deb9e1c05d091b04477cf1bfbfc05b1f51abb
      
https://github.com/Dolibarr/dolibarr/commit/212deb9e1c05d091b04477cf1bfbfc05b1f51abb
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M htdocs/core/modules/import/import_csv.modules.php

  Log Message:
  -----------
  Fix: fails to import when value is 'AUTO' because compare was case
sensitive.


  Commit: 062c150bc1662c92099cb8ab780db0e59cc7244d
      
https://github.com/Dolibarr/dolibarr/commit/062c150bc1662c92099cb8ab780db0e59cc7244d
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M htdocs/core/modules/import/import_csv.modules.php

  Log Message:
  -----------
  Fix: import of fields with value "auto"


  Commit: 9cd7f68ae88251298f8147b6ececccebc1e32ecf
      
https://github.com/Dolibarr/dolibarr/commit/9cd7f68ae88251298f8147b6ececccebc1e32ecf
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M htdocs/comm/prospect/list.php

  Log Message:
  -----------
  Merge branch '3.4' of address@hidden:Dolibarr/dolibarr.git into 3.4


  Commit: d3e951e1ec4c387f8dff3f9c4fa67ddc19f98356
      
https://github.com/Dolibarr/dolibarr/commit/d3e951e1ec4c387f8dff3f9c4fa67ddc19f98356
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M htdocs/core/modules/import/import_csv.modules.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.4' into 3.5


  Commit: dc7db87ee53571eba11283044dee2efe5c1abc8a
      
https://github.com/Dolibarr/dolibarr/commit/dc7db87ee53571eba11283044dee2efe5c1abc8a
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M htdocs/imports/import.php

  Log Message:
  -----------
  Perf: Avoid makign a "desc table" for each row we import (for this we
are using a global cache array).


  Commit: f9c1b590d04e504cd99a857cbcc76f0a6cc00007
      
https://github.com/Dolibarr/dolibarr/commit/f9c1b590d04e504cd99a857cbcc76f0a6cc00007
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M build/perl/virtualmin/dolibarr.pl
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/import/import_csv.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/project/pdf/pdf_baleine.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/core/tpl/document_actions_post_headers.tpl.php
    M htdocs/core/tpl/document_actions_pre_headers.tpl.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/holiday/fiche.php
    M htdocs/langs/en_US/languages.lang
    A htdocs/langs/es_CL/admin.lang
    A htdocs/langs/es_CL/agenda.lang
    A htdocs/langs/es_CL/bills.lang
    A htdocs/langs/es_CL/boxes.lang
    A htdocs/langs/es_CL/commercial.lang
    A htdocs/langs/es_CL/companies.lang
    A htdocs/langs/es_CL/compta.lang
    A htdocs/langs/es_CL/ecm.lang
    A htdocs/langs/es_CL/install.lang
    A htdocs/langs/es_CL/main.lang
    A htdocs/langs/es_CL/members.lang
    A htdocs/langs/es_CL/orders.lang
    A htdocs/langs/es_CL/other.lang
    A htdocs/langs/es_CL/products.lang
    A htdocs/langs/es_CL/projects.lang
    A htdocs/langs/es_CL/propal.lang
    A htdocs/langs/es_CL/workflow.lang
    M htdocs/projet/document.php
    M htdocs/projet/tasks/document.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.5' into develop

Conflicts:
        build/debian/changelog
        build/doxygen/dolibarr-doxygen.doxyfile
        build/exe/doliwamp/doliwamp.iss
        build/perl/virtualmin/dolibarr.pl
        build/rpm/dolibarr_fedora.spec
        build/rpm/dolibarr_generic.spec
        build/rpm/dolibarr_mandriva.spec
        build/rpm/dolibarr_opensuse.spec
        htdocs/compta/facture.php
        htdocs/core/modules/import/import_csv.modules.php
        htdocs/filefunc.inc.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/2cced0bf437d...f9c1b590d04e

reply via email to

[Prev in Thread] Current Thread [Next in Thread]