Marcos García de La Fuente
|
b822a1e3ad
|
Merge branch 'develop' into commercial-name
Conflicts:
htdocs/societe/class/societe.class.php
|
2015-03-15 18:20:17 +01:00 |
|
Marcos García de La Fuente
|
2ba795fcbc
|
NEW: [ task #851 ] Add a new field: Commercial name
|
2015-02-28 14:30:06 +01:00 |
|
phf
|
c459794999
|
[CORE] gestion de l'affichage de l'incoterm sur les différents PDF de base (#incoterm).
|
2015-02-23 10:36:44 +01:00 |
|
Laurent Destailleur
|
11d1be882c
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/contrat/list.php
|
2014-10-04 17:32:01 +02:00 |
|
Laurent Destailleur
|
97eec37f1c
|
Uniformize code: property "nom" for thirdparty is aliased into "name"
everywhere.
|
2014-10-04 17:20:17 +02:00 |
|
Francis Appels
|
bcc5bebd77
|
Fix deliveryorder qty and remainingqty positions
|
2014-10-03 12:28:42 +02:00 |
|
Laurent Destailleur
|
14ab409ca9
|
Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
htdocs/admin/stock.php
htdocs/admin/system/index.php
htdocs/comm/fiche.php
htdocs/core/lib/admin.lib.php
htdocs/core/lib/holiday.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/login/functions_forceuser.php
htdocs/core/login/functions_http.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/filefunc.inc.php
htdocs/holiday/define_holiday.php
htdocs/opensurvey/fonctions.php
htdocs/societe/canvas/actions_card_common.class.php
test/phpunit/CompanyBankAccountTest.php
test/phpunit/ExportTest.php
test/phpunit/FactureTest.php
test/phpunit/FunctionsLibTest.php
test/phpunit/PropalTest.php
test/phpunit/SocieteTest.php
test/phpunit/WebservicesInvoicesTest.php
test/phpunit/WebservicesThirdpartyTest.php
|
2014-09-28 02:14:32 +02:00 |
|
Regis Houssin
|
64b757ed81
|
Fix: add generic doc and use doc dir instead pdf
|
2014-09-25 12:44:57 +02:00 |
|