Marcos García de La Fuente
|
ce7ed70d74
|
Merge branch 'develop' into commercial-name
Conflicts:
htdocs/comm/prospect/list.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
|
2015-05-10 12:23:07 +02:00 |
|
Laurent Destailleur
|
0479bd5a59
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/contrat/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/modules/modAdherent.class.php
|
2015-05-03 13:00:39 +02:00 |
|
Laurent Destailleur
|
060d8a1a38
|
FIX Ref/label of product on contract line was not visible, nor into
page, nor into PDF.
|
2015-04-29 19:57:01 +02:00 |
|
Marcos García de La Fuente
|
15b1f03a08
|
Merge branch 'develop' into commercial-name
Conflicts:
htdocs/comm/list.php
htdocs/comm/prospect/list.php
htdocs/societe/consumption.php
htdocs/societe/soc.php
|
2015-04-19 00:48:07 +02:00 |
|
Scrutinizer Auto-Fixer
|
918ed34364
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2015-04-07 00:45:30 +00: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 |
|
Marcos García de La Fuente
|
df1f931ab8
|
Fixed: [ bug #1767 ] Contract document is not generated properly
|
2014-12-28 18:10:41 +01:00 |
|
Laurent Destailleur
|
df9a6dae6c
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fichinter/fiche.php
|
2014-11-28 02:20:01 +01:00 |
|
Marcos García de La Fuente
|
1c16a2e621
|
Fixed [ bug #1642 ]: add a free line in contract
|
2014-11-28 01:15:45 +01:00 |
|
Francis Appels
|
18406fc550
|
Fix: Show sender Country on PDF docs
Show sender Country on PDF docs when sender Country != receiver Country
|
2014-11-25 14:26:45 +01:00 |
|
Laurent Destailleur
|
97eec37f1c
|
Uniformize code: property "nom" for thirdparty is aliased into "name"
everywhere.
|
2014-10-04 17:20:17 +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 |
|
Laurent Destailleur
|
e8b7c9c6bd
|
Fix: doxygen
|
2014-09-27 16:00:11 +02:00 |
|
Laurent Destailleur
|
60c633fd8b
|
Qual: Generalize hook afterPDFCreation.
New: Add hook beforePDFCreation
|
2014-09-04 23:24:19 +02:00 |
|
Laurent Destailleur
|
7cb283d0ea
|
Prepare code to be able to choose what to show into footer
|
2014-08-25 19:16:37 +02:00 |
|
Marcos García de La Fuente
|
ec661d0c6c
|
Removed index.php and replaced them with blank index.html as it is more appropriate
|
2014-07-12 23:18:57 +02:00 |
|
Raphaël Doursenaud
|
13cb2e478f
|
Contracts module configuration: missing translation string
|
2014-05-19 14:37:30 +02:00 |
|
Raphaël Doursenaud
|
f8f502d013
|
Removed closing php tag
http://php.net/manual/en/language.basic-syntax.phptags.php
|
2014-05-03 18:18:44 +02:00 |
|
Raphaël Doursenaud
|
b3630cc588
|
Qual: Missing variable declaration
|
2014-04-23 18:24:04 +02:00 |
|
Raphaël Doursenaud
|
2970ead6f3
|
Qual: Wrong type in method documentation
|
2014-04-23 18:24:04 +02:00 |
|
philippe grand
|
f9c48be2a9
|
fix : display specimen
|
2014-03-14 18:23:37 +01:00 |
|
Grand Philippe
|
da384dda18
|
uniformize
|
2013-09-02 11:53:07 +02:00 |
|
Grand Philippe
|
a0c04a548b
|
first step to complete contract functionalities
|
2013-08-24 15:59:49 +02:00 |
|