lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
90,609 Commits 43 Branches 150 Tags 886 MiB
693e345cab
Commit Graph

90609 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Louis Carrese
693e345cab CLOSE #15065 Fix formatting 
Had spaces instead of tabs...
 2020-10-20 14:34:17 +02:00
Louis Carrese
f377456132 CLOSE #15065 Put the product label in bold in the PDF templates if configured 
The global configuration variable PDF_BOLD_PRODUCT_LABEL is checked to put the product label in bold in the PDF
templates.
This modification is based on the same behaviour for the product reference, found at line 1373 of the same file.

The products table of the invoices / commercial propositions is produced in the PDF library, hence we have to modify
this library to style the invoices.
Producing a new template would mean duplicating code from the library with the maintenace implications.
 2020-10-20 14:19:37 +02:00
Laurent Destailleur
ef182bed07 Fix browser reminder 2020-10-18 14:00:47 +02:00
Laurent Destailleur
547b3602cc FIX refresh of tasks combo must use an ajax page not a full html page 2020-10-17 21:14:19 +02:00
Laurent Destailleur
53eef48596 Doc 2020-10-17 20:06:30 +02:00
Laurent Destailleur
a9521b13f9 FIX Assignement of event to create when created from view per user. 2020-10-17 19:52:23 +02:00
Laurent Destailleur
8432a2a0dd Fix phpcs 2020-10-17 19:05:08 +02:00
Laurent Destailleur
4fe857f5d2 Change picto to close a widget 2020-10-17 17:54:09 +02:00
Laurent Destailleur
05535556c7 css 2020-10-17 16:39:47 +02:00
Laurent Destailleur
1a1e23bf5d Clean code 2020-10-17 16:01:43 +02:00
Laurent Destailleur
7b20e703ee Clean code 2020-10-17 15:53:31 +02:00
Laurent Destailleur
27698ab5c7 Protect page for module management with token even for GET action 2020-10-17 14:01:09 +02:00
Laurent Destailleur
20b6d3828e NEW Show image of user in the combo select of users 2020-10-17 13:27:39 +02:00
Laurent Destailleur
5df1218d9f Enhance page to setup email templates 2020-10-17 12:59:22 +02:00
Laurent Destailleur
dfb5c78a68 FIX bad concat when generating desription of event on email sent 2020-10-17 11:51:17 +02:00
Laurent Destailleur
3d215048d0 Update Stripe API use to 2020-08-27 2020-10-17 11:16:30 +02:00
Laurent Destailleur
e3552e7e02 Clean code 2020-10-16 20:17:54 +02:00
Laurent Destailleur
f737e01a31 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-16 17:40:35 +02:00
Laurent Destailleur
4a3dc6ecb3 Fix syntax error 2020-10-16 17:40:19 +02:00
Laurent Destailleur
67785887fd
Merge pull request #15035 from andreubisquerra/master 
Change the tag char for security reasons in 'Receipt Printer' module
 2020-10-16 17:20:04 +02:00
Laurent Destailleur
b69d178436
Merge pull request #15038 from aspangaro/13a25 
FIX Binding on expense report (Double rowid)
 2020-10-16 17:15:17 +02:00
Laurent Destailleur
52a5ac965b
Merge pull request #15042 from ndrosis/patch-27 
Add & Update tva for Greece
 2020-10-16 17:13:46 +02:00
Laurent Destailleur
27282d7e3d FIX Include the ticket and mo table in merge process of thirdparty 2020-10-16 17:08:23 +02:00
Laurent Destailleur
885e6caaa1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2020-10-16 15:53:31 +02:00
Laurent Destailleur
6bba249935 FIX pdf_getlinetotalwithtax must show total incl tax 2020-10-16 15:50:51 +02:00
Laurent Destailleur
e74b833d7f Look and feel v13 2020-10-16 15:40:52 +02:00
Laurent Destailleur
3e75cbbeb5 Fix for smartphone 2020-10-16 14:50:36 +02:00
Drosis Nikos
6ea9befb48
Add & Update tva for Greece 2020-10-16 15:20:12 +03:00
Laurent Destailleur
4dea8c4bb7 Fix missing token 2020-10-16 13:36:05 +02:00
Laurent Destailleur
7504f92a41 Standardize code and look and feel 2020-10-16 13:30:20 +02:00
Alexandre SPANGARO
67cf917f7b FIX Binding on expense report (Double rowid) 2020-10-16 11:57:36 +02:00
Laurent Destailleur
7a7e1ad7cf CSS 2020-10-16 00:29:35 +02:00
Laurent Destailleur
5905d3be64 Fix phpcs 2020-10-16 00:06:26 +02:00
jove@bisquerra.com
f90b236e0f Change the tag char for security reasons in 'Receipt Printer' module 2020-10-15 23:44:13 +02:00
Laurent Destailleur
64b1a31e45
Merge pull request #15018 from FHenry/dev_add_dict_NatureOfProductType 
NEW : Nature of product is now a dictionay
 2020-10-15 21:07:42 +02:00
Laurent Destailleur
a1913995df Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-15 21:05:00 +02:00
Laurent Destailleur
e7992131ec Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
 2020-10-15 21:00:49 +02:00
Laurent Destailleur
cd9acd02a1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-15 20:51:46 +02:00
Laurent Destailleur
9bbb471b4f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/loan/card.php
 2020-10-15 20:51:30 +02:00
Laurent Destailleur
6277422115 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-15 20:38:32 +02:00
Laurent Destailleur
a9a519e890
Merge pull request #15025 from fmarcet/10.0 
FIX: Unable to edit extrafields in expense report
 2020-10-15 20:30:14 +02:00
Laurent Destailleur
4eddcb7503
Merge pull request #15023 from Ahuahuachi/10.0 
FIX #14927 Change ContratLigne property type to product_type
 2020-10-15 20:29:38 +02:00
Laurent Destailleur
3d68ab4059
Update box_services_contracts.php 2020-10-15 20:28:27 +02:00
Laurent Destailleur
75290d1bd4
Update contrat.class.php 2020-10-15 20:26:12 +02:00
Laurent Destailleur
c3a02d0391
Update contrat.class.php 2020-10-15 20:24:26 +02:00
Laurent Destailleur
24f7a8aeed
Merge pull request #15028 from FHenry/fix_intracom 
fix table creation for intracom and change reserved name column name
 2020-10-15 20:19:05 +02:00
Laurent Destailleur
86887fc650
Update intracommreport.php 2020-10-15 20:18:00 +02:00
Laurent Destailleur
4c684536d1
Merge pull request #15031 from FHenry/dev_add_lateOutsatndingAmount_into_customer_tab 
NEW: Thirdparty module : box on customer/supplier tab for invoice outsantding amount late
 2020-10-15 20:16:45 +02:00
Laurent Destailleur
2155c0123d
Merge pull request #15021 from Givriz/dev 
Fix : correction de commentaires
 2020-10-15 20:15:12 +02:00
Laurent Destailleur
14a26c499f
Merge pull request #15027 from ATM-Nicolas/fix_ecm_src_object_type 
FIX : Use table_element instead of element
 2020-10-15 20:14:39 +02:00