Commit Graph

90904 Commits

Author SHA1 Message Date
Laurent Destailleur
88df2ef36d
Merge pull request #15076 from FHenry/12.0_fix_margin_token
fix form token missing
2020-10-22 15:49:56 +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
Laurent Destailleur
9775728b7d
Merge pull request #15091 from ATM-Consulting/fix/12.0_object_thirdparty_not_always_fetched_on_presend_action_from_order
FIX 12.0 - third party of object is not always fetched when initiating an e-mail presend form
2020-10-22 15:43:31 +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
Marc de Lima Lucio
a232a19e7d FIX: virtual products: supplier discount was not applied in component list 2020-10-22 15:16:33 +02:00
Laurent Destailleur
732f236c32
Merge pull request #15084 from FHenry/12.0_fix_tokenCheck_GetSupplierPrice
12.0 fix token check get supplier price
2020-10-22 15:13:40 +02:00
Laurent Destailleur
d521ad6db4
Update objectline_edit.tpl.php 2020-10-22 15:11:54 +02:00
Laurent Destailleur
46a31f443d
Update objectline_create.tpl.php 2020-10-22 15:11:01 +02:00
Florian Mortgat
56db7d6c64 FIX: also check if there is a method $object->fetch_thirdparty() before calling it 2020-10-22 15:09:48 +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
Florian Mortgat
509819c119 FIX 12.0 - third party of object is not always fetched when initiating the e-mail presend action (e.g. from an order) 2020-10-21 23:19:29 +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
Florian HENRY
93a97492ae review 2020-10-21 20:41:50 +02:00
Florian HENRY
0a9293c9c6 fix token CSRF check for getSupplierPrice ajax call 2020-10-21 20:40:53 +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
a96c193ab0
Merge pull request #15078 from FHenry/12.0_fix_if_no_pdf_model_no_pdf_created
FIX if no PDF default model in admin for expense report, do not create a PDF
2020-10-21 19:55:43 +02:00
Laurent Destailleur
be79791561
Merge pull request #15080 from atm-john/12.0_fix_display_field_on_page_load
12.0 fix display field on page load & admin conf
2020-10-21 19:54:45 +02:00
Laurent Destailleur
7605cb1871
Update facture_situation.php 2020-10-21 19:54:28 +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
John Botella
70790009a9 Fix display warranty fields on page load 2020-10-21 14:49:51 +02:00
Florian HENRY
d347af385b new: add PDFInvoiceSituation translation key for PDF title 2020-10-21 13:47:40 +02:00
Florian HENRY
c9e62845e8 fix is no PDF default model for expense report, no PDF created 2020-10-21 13:41:17 +02:00
John Botella
d9074e70e1 FIX admin conf selected 2020-10-21 13:27:37 +02:00
Florian HENRY
e23a289553 fix form token missing 2020-10-21 13:26:28 +02:00
Florian HENRY
b0641e6d69 better rix 2020-10-21 13:22:32 +02:00
Florian HENRY
a5e195d1c7 better rix 2020-10-21 13:20:17 +02:00
Florian HENRY
13dfa56c2f fix recipt when no dispatch 2020-10-21 13:18:11 +02:00
Laurent Destailleur
a729bff062 Fix trans 2020-10-21 11:54:18 +02:00
Florian HENRY
d4fd71d0b3 fix #14649 2020-10-20 19:58:11 +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