Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-17 15:01:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
48,581 Commits 36 Branches 190 Tags
b59b7785eecb51e50bcf3cf30e224e9435de80f9
Commit Graph

188 Commits

Author SHA1 Message Date
Marcos García de La Fuente
460a2ec2ab Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/categories/categorie.php
	htdocs/comm/prospect/list.php
 2015-05-25 15:09:46 +02:00
Laurent Destailleur
a258370f8a Prepare code for generic solution where all path are forged using 
get_exdir.
 2015-05-18 22:25:51 +02:00
Laurent Destailleur
4d6b25eb45 Prepare to generalize usage of get_exdir 2015-05-18 21:47:44 +02:00
Florian HENRY
f29d8aed5b Fix problem with multicompany on new feature Product propal merge PDF 
product
 2015-05-15 17:39:28 +02:00
Marcos García de La Fuente
457918c0f7 Merge remote-tracking branch 'upstream/develop' into commercial-name 2015-05-15 11:17:21 +02:00
Maxime Kohlhaas
443badfbcf New : Signature area on proposal PDF 2015-05-10 17:39:57 +02:00
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
a93ba86ce0 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/core/modules/modContrat.class.php
	htdocs/expedition/class/expedition.class.php
 2015-05-07 13:35:09 +02:00
Laurent Destailleur
36ebaf7a22 Clean code 2015-05-06 23:31:03 +02:00
Juanjo Menent
ea95a461e2 Fix: Make propal pdf "azur" compatible with the two products images 
storage system on use MAIN_GENERATE_PROPOSALS_WITH_PICTURE
 2015-05-06 17:17:41 +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
Marcos García de La Fuente
87f97ed545 Merge branch 'develop' into units 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/admin/product.php
	htdocs/product/card.php
 2015-04-18 23:38:14 +02:00
Florian HENRY
e15d4c045d NEW : Propal merge product card PDF into azur 2015-04-18 18:44:05 +02:00
Marcos García de La Fuente
7075ac74c4 Merge branch 'develop' into units 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/class/product.class.php
 2015-04-03 15:45:54 +02:00
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
b4c84fac9d NEW: [ task #977 ] New option to manage product unit 
Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
 2015-03-01 12:42:38 +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
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
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
5d57c59241 Fix: Bad parameter of get_substitutionarray_other 2014-10-15 18:16:41 +02:00
Laurent Destailleur
8df8fb2fe0 Qual: Removed a lot of duplicate code 
New: extrafields for projects and tasks are exported to ODT documents.
 2014-10-12 16:19:00 +02: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
d976a5575b New: Add option MAIN_GENERATE_INVOICES_WITH_PICTURE to show picture onto 
PDF like MAIN_GENERATE_PROPOSALS_WITH_PICTURE dir for proposals.
 2014-09-17 14:36:04 +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
Laurent Destailleur
c799f0f10f Uniformize code: 
New: Call to hook after generation is also done into odt.
Fix: Missing hook before save.
 2014-08-21 15:02:18 +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
Juanjo Menent
3679a4ba90 [ task #1063 ] Allow edit localtaxes rate for thirds. Works documents 
pdf
 2014-07-04 13:11:51 +02:00
Laurent Destailleur
8d1fdec8cf Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/fiche.php
	htdocs/projet/fiche.php
 2014-06-20 15:26:02 +02:00
Laurent Destailleur
fcb00b2024 Fix: [ bug #1425 ] 2014-06-20 13:38:44 +02:00
Laurent Destailleur
9add45aea3 Qual: Mutualize code. 2014-05-07 13:22:02 +02:00
Laurent Destailleur
845f764f93 Increase default size of image 2014-05-07 12:21:14 +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
1d52f6d6c2 Qual: Fixed typo 2014-04-23 18:24:08 +02:00
Laurent Destailleur
b675b9b610 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/facture/fiche.php
	htdocs/langs/en_US/admin.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/projet/tasks/task.php
 2014-03-31 00:44:45 +02:00
Laurent Destailleur
f115501ddf Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-03-24 00:16:47 +01:00
Laurent Destailleur
466de67b5b Fix: Solve pb of too many embedded tables 2014-03-23 20:18:07 +01:00
Laurent Destailleur
f9c1b590d0 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
 2014-03-19 22:29:18 +01:00
Laurent Destailleur
2f10198064 Fix: Option MAIN_PDF_DASH_BETWEEN_LINES was not working when tcpdf was 
making a pagebreak higher than 2 pages.
 2014-03-19 16:36:12 +01:00
Laurent Destailleur
bf735cacbe 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.
 2014-03-19 13:32:54 +01:00
Laurent Destailleur
1ebd56c4ee New: Add option MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE 2014-01-20 00:40:01 +01:00
Laurent Destailleur
16bcd6b5e5 Add error management to avoid blank page when there is no permission to 
read file.
 2013-10-23 19:19:54 +02:00
Maxime Kohlhaas
845deb9a63 Add multilang management in ODT models 2013-10-08 09:17:04 +02:00
Laurent Destailleur
141258f514 Merge remote-tracking branch 'origin/3.4' into develop 
and fix syntax errors into sql requests.
Group by must ALWAYS contains fields that are not included into SUM or
COUNT

Conflicts:
	htdocs/fourn/product/liste.php
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
 2013-10-07 16:17:51 +02:00
Laurent Destailleur
c2ba7956ab Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2013-09-22 19:57:48 +02:00
Laurent Destailleur
ad09470f48 Fix: Better management of pdf generation when tcpdf not available. 2013-09-22 19:53:27 +02:00
simnandez
4c7907b773 [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-15 11:47:31 +02:00