Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
65,825 Commits 36 Branches 189 Tags
2ad91213b2dd5c2bcd136b51f8a281f688df6378
Commit Graph

312 Commits

Author SHA1 Message Date
Laurent Destailleur
3060647212 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2018-10-04 17:50:19 +02:00
Laurent Destailleur
8690d65479 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2018-10-04 17:47:22 +02:00
atm-greg
583ea05567 fix missing letter... 2018-10-03 12:13:53 +02:00
gauthier
587766b39b FIX : wrong function name 2018-10-03 10:38:47 +02:00
Laurent Destailleur
dfea391c88 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2018-09-05 20:39:38 +02:00
Laurent Destailleur
252335318f Update pdf.lib.php 2018-09-04 09:57:01 +02:00
Marc de Lima Lucio
e285b42a18 FIX: PDF address: handle when contact thirdparty different from document thirdparty 2018-09-03 17:57:30 +02:00
Laurent Destailleur
30b4d88428 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/product/reassort.php
	htdocs/societe/list.php
 2018-08-12 19:23:45 +02:00
John BOTELLA
4ddca02bb9 fix situation line's total 2018-07-31 14:58:33 +02:00
Laurent Destailleur
97c9549087 Fix ref supplier must be output if it exists, even for free products 2017-11-13 11:30:41 +01:00
Laurent Destailleur
f33182acc5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-12 20:49:53 +01:00
Laurent Destailleur
356525730d FIX #7786 2017-11-12 20:12:56 +01:00
Laurent Destailleur
955ed7dbbf NEW Show the supplier ref into supplier cards 2017-11-12 15:30:21 +01:00
Laurent Destailleur
cb6bf91044 Merge pull request #7787 from libersoft/feature/correct-italian-address-format 
NEW Support Italian addresses format. Fixes #7785
 2017-11-11 17:38:29 +01:00
Valerio Baldisserotto
15a501467e FR: Support Italian address format. Fixes #7785 2017-11-08 11:43:52 +01:00
Laurent Destailleur
ce3e586bd0 Fix doxygen 2017-11-03 11:44:31 +01:00
Laurent Destailleur
068f5e32cb NEW Tooltip for substitutions variables on tooltips on admin pages 2017-10-31 11:17:44 +01:00
KHELIFA
d77dfb9199 Fix return chariot 2017-10-09 09:26:25 +02:00
KHELIFA
dc87133e0b Fix carriage return when get full address formated for output on documents 2017-10-06 15:06:59 +02:00
Laurent Destailleur
7c30b3ca5d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-10-02 01:28:20 +02:00
atm-ph
7ba2dd8397 Fix the pdf_getlineprogress hook isn't use because hookmanager is null 2017-09-28 15:25:51 +02:00
Laurent Destailleur
537a551bb5 Fix vat visiblity on pdf 2017-09-27 21:58:42 +02:00
Juanjo Menent
bfc5f01e1e NEW Add detail of all tax rates into pdf column tax sale. 
-Can be hidden by pdf setup page
-For know if localtax is applied into line we have to read totaltax line
 2017-08-30 14:36:00 +02:00
Laurent Destailleur
6c202c5fa1 Fix vat rate to show and not vat amount 2017-08-29 19:55:49 +02:00
Laurent Destailleur
dabd882056 Use a slash 2017-08-29 17:24:49 +02:00
Laurent Destailleur
e862ba9daf NEW Add detail of all tax rates into pdf column tax sale. 2017-08-29 17:22:03 +02:00
Laurent Destailleur
975fd0a6d3 Fix font size 2017-08-07 15:43:42 +02:00
Laurent Destailleur
aa66676b7d Quick hack to solve missing alias name on doc. 2017-07-09 15:15:23 +02:00
Laurent Destailleur
9e26e6b0a3 Fix bad value for ref of old contracts 2017-07-03 11:42:17 +02:00
Laurent Destailleur
3b7667292b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-27 11:59:40 +02:00
Laurent Destailleur
4a21457b8a Fix position of page nb 2017-06-26 09:28:02 +02:00
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