Commit Graph

90642 Commits

Author SHA1 Message Date
Laurent Destailleur
763d0baa14
Merge pull request #15066 from louiscarrese/develop
CLOSE #15065 Put the product label in bold in the PDF templates if co…
2020-10-22 15:53:43 +02:00
Laurent Destailleur
272caceab9
Merge pull request #15071 from joseplluis/patch-8
Add customer country information in popup
2020-10-22 15:53:12 +02:00
Laurent Destailleur
a83131276d
Merge pull request #15079 from FHenry/dev_addtranslationkeyPDFInvoiceSituation
new: add PDFInvoiceSituation translation key for PDF title
2020-10-22 15:49:25 +02:00
Laurent Destailleur
1a70c016c5
Merge pull request #15093 from OPEN-DSI/new-invoice-list-margin-info-rights
Add rights on margin info on invoice list
2020-10-22 15:49:05 +02:00
Laurent Destailleur
bf6ec35478
Merge pull request #15095 from joseplluis/patch-9
FIX input name in MRP mask const
2020-10-22 15:45:36 +02:00
Laurent Destailleur
b96a59b089
Merge pull request #15086 from ppenelon/develop
NEW Retrieve discount from invoice from API
2020-10-22 15:45:09 +02:00
Laurent Destailleur
d7b7e1e386
Merge pull request #15083 from frederic34/printing_module
can add a driver for printing in module
2020-10-22 15:43:55 +02:00
Josep Lluís
1221cc854d
FIX input name in MRP mask const
input name in MRP mask const was wrong
2020-10-22 15:23:45 +02:00
Laurent Destailleur
a5d52baa05
Merge pull request #15089 from frederic34/patch-7
fill incoterms with company parameters
2020-10-22 15:09:47 +02:00
Laurent Destailleur
b45c99faec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-22 15:03:34 +02:00
Laurent Destailleur
92c6152ad5 FIX #14995 2020-10-22 15:03:12 +02:00
lvessiller
b13ef34804 NEW add rights on margin info on invoice list 2020-10-22 14:56:53 +02:00
Frédéric FRANCE
7d8df07253
Update card.php 2020-10-22 11:46:12 +02:00
Pierre Penelon
1d218b3260
Linting api_invoices.class.php 2020-10-22 09:56:13 +02:00
Pierre Penelon
b8cb080f0d
ADD Retrieve discount from invoice from API
As I was unable to retrieve discount ID of created discount from invoice with API.
This commit add a route to get discount from a specific invoice ID.
2020-10-22 09:26:46 +02:00
Frédéric FRANCE
f54164bd10
modify action 2020-10-21 21:33:23 +02:00
Frédéric FRANCE
f500076247
remove warning 2020-10-21 21:21:30 +02:00
Frédéric FRANCE
4873794dc0
doxygen 2020-10-21 21:08:33 +02:00
Frédéric FRANCE
06325f9422
doxygen 2020-10-21 21:00:50 +02:00
Frédéric FRANCE
81f6a7abb6
can add a driver for printing in module 2020-10-21 20:18:06 +02:00
Laurent Destailleur
351c8a5a2d Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2020-10-21 20:10:43 +02:00
Pierre Penelon
cd1f8dd1da
Merge pull request #1 from Dolibarr/develop
Update from master
2020-10-21 20:01:29 +02:00
Laurent Destailleur
30f8dbad59
Merge pull request #15081 from OPEN-DSI/new-invoice-list-margin-info
NEW add margin info in invoice list
2020-10-21 19:53:07 +02:00
Laurent Destailleur
5a9aa38cd1
Merge pull request #15082 from frederic34/patch-7
add missing parameter
2020-10-21 19:51:33 +02:00
Laurent Destailleur
409f8f9866 Update doc 2020-10-21 19:50:40 +02:00
Frédéric FRANCE
672797aa65
add missing parameter 2020-10-21 17:09:40 +02:00
lvessiller
9b423106dc NEW add margin info in invoice list 2020-10-21 16:10:48 +02:00
Florian HENRY
d347af385b new: add PDFInvoiceSituation translation key for PDF title 2020-10-21 13:47:40 +02:00
Laurent Destailleur
a729bff062 Fix trans 2020-10-21 11:54:18 +02:00
Laurent Destailleur
2a31d43938 FIX Show errors in session on login page 2020-10-20 18:41:26 +02:00
stickler-ci
ff02bba5bf Fixing style errors. 2020-10-20 15:18:29 +00:00
Josep Lluís
e51dd2919e
Add customer country information in popup
Add customer country information in popup of draft invoices.
In other boxes it's ok.
2020-10-20 17:15:03 +02:00
Laurent Destailleur
4ec4801c77 FIX Only template of enabled modules visible 2020-10-20 15:54:08 +02:00
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