lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
68,848 Commits 43 Branches 150 Tags 886 MiB
f8b0e535fa
Commit Graph

331 Commits

Author SHA1 Message Date
Laurent Destailleur
bebe7baa80 Fix images into medias not reabable into send emails 2017-06-17 10:44:08 +02:00
Laurent Destailleur
1d91ce90d3 FIX image from medias directory into PDF free text 2017-06-17 00:16:22 +02:00
Laurent Destailleur
7ad92c3a4d Fix new generic substitution system 2017-06-01 13:32:20 +02:00
Laurent Destailleur
c70beaa56b Complete work for mutualizing generic substitution system. 2017-06-01 01:57:22 +02:00
Laurent Destailleur
f069ef9844 FIX #6767 2017-05-05 09:16:11 +02:00
BENKE Charlie
058b43f342 display the good value on pdf 2017-04-28 16:50:30 +02:00
BENKE Charlie
1792ff2d3b oups inverted value 2017-04-21 09:41:08 +02:00
BENKE Charlie
b7f1e74f6f New SITUATION_DISPLAY_DIFF_ON_PDF feature 
allow to display or 
the progress situation percent value
the diférential situation percent value
 2017-04-20 10:27:44 +02:00
Laurent Destailleur
0994622bf8 NEW Can use translations into all substitutions (watermark, freetext...) 2017-04-17 23:54:09 +02:00
Laurent Destailleur
28ad50e059 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/suppliers.lang
 2017-03-03 14:31:35 +01:00
Laurent Destailleur
34e5e5f721 FIX #6460 2017-03-03 14:19:46 +01:00
Laurent Destailleur
b611c5ca53 Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received 
NEW Develop new reduc on excess received
 2017-02-08 11:16:10 +01:00
Laurent Destailleur
13f37b2cb9 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-02 02:25:49 +01:00
fappels
8e675fa039 Improve lot qty separation 
Add spaces to lot info separation.
Use implode params according PHP doc.
 2017-01-31 12:54:00 +01:00
Laurent Destailleur
4d134a4a4e Merge pull request #6085 from defrance/patch-49 
NEW Extend option PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES to change supplier ref display mode in PDF
 2017-01-12 11:19:54 +01:00
BENKE Charlie
d86503cb66 additionnal feature on supplier ref display 
we have like this 3 mode of display supplier ref
 2016-12-05 11:09:47 +01:00
BENKE Charlie
7ab7149e64 just little indenting 2016-12-05 11:03:12 +01:00
Milamber
e4006602f3 Fix the new 'Identifiant Commun de l'Entreprise' label in L10N files for Morocco (Maroc) 
Fix issue in pdf.lib.php to add the Prof ID 5 and 6

Ref: http://www.ice.gov.ma/ICE/
 2016-12-05 08:04:34 +00:00
gauthier
9a1309256d Merge branch 'NEW_reduc_on_excess_received' of github.com:atm-gauthier/dolibarr into develop_NEW_reduc_on_excess_received 2016-11-28 17:13:09 +01:00
gauthier
c433829d27 NEW : interface 2016-11-25 11:04:42 +01:00
Laurent Destailleur
658e30aa2f Close #4685 2016-10-29 18:09:57 +02:00
Laurent Destailleur
eee53998ad Mark function as deprecated #5577 2016-09-02 22:14:15 +02:00
Marcos García de La Fuente
7e0b99d5ab Little changes to PHPDoc comment block 2016-08-11 15:23:00 +02:00
Laurent Destailleur
b267402df6 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php
 2016-08-01 15:15:32 +02:00
Laurent Destailleur
74a9bbbf38 FIX private property can't be read when building pdf 2016-07-28 23:51:09 +02:00
florian HENRY
32e954c8d8 Merge branch 'develop' of local repository into dev_fix5353 2016-07-01 15:08:15 +02:00
Laurent Destailleur
5713d293e3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2016-07-01 03:22:16 +02:00
Laurent Destailleur
625213580c Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2016-07-01 03:17:20 +02:00
florian HENRY
d431e73ec8 Fix #5353 2016-06-30 15:49:57 +02:00
Alexis Algoud
22bc44620b FIX #5170 tva sign with INVOICE_POSITIVE_CREDIT_NOTE option 2016-06-30 14:27:58 +02:00
Laurent Destailleur
2e4c6597d8 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
 2016-06-23 21:05:00 +02:00
Frédéric FRANCE
3690d11ca2 Update pdf.lib.php 2016-06-23 10:48:52 +02:00
Laurent Destailleur
4382f2a437 Clean language files 2016-06-18 11:06:11 +02:00
Laurent Destailleur
5fd64c81a6 Missing translation 2016-05-21 12:21:17 +02:00
Laurent Destailleur
7087b650d0 More precise parameter parameter targetwithdetails 2016-05-19 17:37:06 +02:00
Maxime Kohlhaas
0358db0065 Fix use of details in pdf foot 2016-04-23 17:10:56 +02:00
Laurent Destailleur
bfc5be1aad FIX Fix and move dolGetFirstLine function into main 
FIX Hang on ->client not defined
 2016-04-22 19:07:32 +02:00
Marcos García de La Fuente
a41a80b8fe Merge branch 'develop' into oop-refactor-bankaccount-tostring 2016-04-09 23:17:09 +02:00
Scrutinizer Auto-Fixer
c2243909e9 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-04-09 13:07:33 +00:00
Marcos García de La Fuente
889c72611d NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown 2016-03-19 23:00:33 +01:00
Marcos García de La Fuente
7fbf16a202 Fixed an error including FormBank class 2016-03-19 20:51:43 +01:00
Marcos García de La Fuente
8ef122ad99 Fixed missing require bug 2016-03-19 20:12:41 +01:00
Marcos García de La Fuente
1be9c53b6c NEW Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country 2016-03-19 19:39:18 +01:00
Laurent Destailleur
23f45c7b7e Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/commande/list.php
	htdocs/core/lib/pdf.lib.php
 2016-02-26 15:45:25 +01:00
Laurent Destailleur
4250fe155a Fix showing ref of shipment on orders (lines too long) 2016-02-26 15:42:07 +01:00
Laurent Destailleur
b072b5a181 Fix remove some warnings 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2016-02-26 10:45:25 +01:00
Laurent Destailleur
61edda61e1 Fix remove some warnings 2016-02-26 10:38:42 +01:00
Laurent Destailleur
4b4de22a54 NEW Add hook pdf_build_address 
NEW Add option MAIN_PUBLIC_NOTE_IN_ADDRESS
 2016-02-25 20:54:37 +01:00
Laurent Destailleur
54034ea852 NEW Add $object in parameter of pdf_build_address so we could include 
hook into the function.
 2016-02-25 18:30:31 +01:00
Laurent Destailleur
cdcad62967 FIX Array of linked elements for PDF contains duplicates and missing 
data
 2016-02-25 18:19:20 +01:00
Laurent Destailleur
7fc58ddabc FIX Array of linked elements for PDF contains duplicates and missing 
data
 2016-02-25 18:18:00 +01:00
Laurent Destailleur
a5c3658f53 Fix bad formatting of order / shipment ref on PDF 2016-02-25 02:45:27 +01:00
Laurent Destailleur
f1ba81ec66 Fix bad formatting of order / shipment ref on PDF 2016-02-25 02:44:34 +01:00
Laurent Destailleur
1ba2407da4 Merge remote-tracking branch 'origin/3.9' into develop 2016-02-25 01:42:03 +01:00
Laurent Destailleur
33d5fa38ef Fix pdfBuildThirdpartyName must return main name. Alias should be an 
option.
 2016-02-24 13:30:16 +01:00
phf
68857499d7 NEW display multicurrency price on azur pdf model 2016-01-21 22:26:51 +01:00
Laurent Destailleur
536413523a Fix to show ref of linked object on documents. Fix is not complete but 
stable.
 2015-12-21 12:52:10 +01:00
Laurent Destailleur
2a345b6fc0 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/admin/company.php
	htdocs/admin/menus/edit.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
 2015-11-21 12:48:41 +01:00
Laurent Destailleur
b75923871c FIX: Too many information were hidden. A lot of users still need bank 
account on PDF.
 2015-11-14 14:56:44 +01:00
Laurent Destailleur
5e67eefff3 Removed phpcs warning 2015-11-13 12:48:17 +01:00
Marcos García de La Fuente
75b4cb4727 NEW #3876 Renamed Product::isservice and Product::isproduct to match PSR-2 2015-11-07 14:37:47 +01:00
philippe grand
04238da75d Typo 2015-11-05 14:16:13 +01:00
Laurent Destailleur
b8ffa56497 Fix #3857 2015-11-02 19:49:00 +01:00
Laurent Destailleur
da0aa2f937 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/langs/en_US/main.lang
	htdocs/product/list.php
	htdocs/product/stock/mouvement.php
 2015-11-02 19:31:42 +01:00
Regis Houssin
6373c82559 Fix: broken features !!! 2015-10-29 13:14:38 +01:00
Regis Houssin
e5b1e214bc Fix: add missing hooks 2015-10-29 11:50:16 +01:00
Laurent Destailleur
9f21ea58a3 A lot hooks used into PDF generation were not correctly implemented. We 
had to fix this. The result si that
the following hook were set as hook of type "replace". This means if
your module implement such hooks, it must 
return 0 to execute standard code or 1 to replace standard code (value
to output should be set into resPrints instead).
 2015-10-22 17:51:05 +02:00
Laurent Destailleur
bbbd5f5202 Fix removed var_dump 2015-10-19 14:55:01 +02:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Laurent Destailleur
8a02c8288b Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/product/index.php
 2015-10-16 09:56:55 +02:00
Laurent Destailleur
9b85a70013 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
 2015-10-16 09:52:38 +02:00
Laurent Destailleur
d4b5256f18 Merge pull request #3611 from atm-alexis/develop 
FIX there is no way to hide or change qty by hook
 2015-10-01 10:27:26 +02:00
Laurent Destailleur
3f506552e3 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/theme/md_exp/style.css.php
 2015-09-27 21:29:16 +02:00
Alexis Algoud
688d6e37e2 FIX there is no way to hide or change qty to useful information by module 2015-09-26 14:42:26 +02:00
philippe
9e185eec75 FIX: order ref must not be translated 2015-09-24 15:29:17 +02:00
Laurent Destailleur
872b59f568 NEW: Add experimental option PDF_ALLOW_HTML_FOR_FREE_TEXT to be able to 
enter pdf footer text with wysiwyg editor.
 2015-09-18 12:34:36 +02:00
Laurent Destailleur
a4ab5f5552 Restore manual install of ckeditor. It seems upgrade with phpcomposer 
make some plugins not working.
 2015-09-18 12:10:47 +02:00
Marcos García de La Fuente
3818bff86a Fix: [ bug 1776 ] Undefined $deliverycompany variable in pdf_build_address 2015-09-16 12:49:05 +02:00
Laurent Destailleur
d19ec89bf1 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/modules/modHoliday.class.php
	htdocs/holiday/card.php
 2015-09-03 23:27:47 +02:00
Marcos García de La Fuente
0955432de3 Merge branch '3.7' into bug-iban-whitespaces-37 
# Conflicts:
#	ChangeLog
 2015-09-03 12:02:23 +02:00
Marcos García de La Fuente
9ec349f410 FIX [ bug #3432 ] Spaces should be removed from IBAN when formatting it 
Close #3432
 2015-09-01 10:56:55 +02:00
Laurent Destailleur
1e3bc9f822 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-30 21:21:37 +02:00
Laurent Destailleur
c06abac49e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/salaries/index.php
	htdocs/contact/class/contact.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/geturl.lib.php
	htdocs/core/lib/pdf.lib.php
 2015-08-30 21:20:50 +02:00
Marcos García
3482031b8a Removed second odd test 2015-08-29 21:44:05 +02:00
Marcos García
8fd7f0f383 Removed odd test 2015-08-29 21:41:15 +02:00
philippe grand
6952084be3 it's a mess 2015-08-27 17:23:23 +02:00
philippe grand
db7defb7c3 Revert "fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level'" 
This reverts commit 2527ae263b.
 2015-08-27 14:43:48 +02:00
philippe grand
2527ae263b fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level' 2015-08-27 14:28:12 +02:00
philippe grand
3743c7460d FIX : pdf_writeLinkedObjects use foreach instead of for($i..) because 
now linked objects return by fetchLinkedObject are associative array
with ID as key.
 2015-08-19 16:36:44 +02:00
Laurent Destailleur
a9289de616 Several fixes. Fix #2927 2015-07-13 11:22:18 +02:00
Laurent Destailleur
8690b5e70e FIX #3173 Overlapping of shipment ref 2015-07-12 16:22:06 +02:00
Laurent Destailleur
fb1a3f3ea3 Rename alternative name 2015-06-16 12:04:11 +02:00
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
Raphaël Doursenaud
ee808cdfd7 Added types constants to categories 2015-05-23 18:52:31 +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
96a33bbe8a First clean of code after devcamp 2015-04-21 15:49:58 +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
8b8171c700 Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/comm/card.php
 2015-03-30 03:25:57 +02:00
Scrutinizer Auto-Fixer
b693ed3f51 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-03-16 23:21:17 +00: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