Commit Graph

84028 Commits

Author SHA1 Message Date
Laurent Destailleur
cd8dd236f4
Merge pull request #14028 from aspangaro/10.0_p38
FIX: Show ref_customer, amount on contract link object
2020-06-06 21:22:11 +02:00
Laurent Destailleur
a5b74189e6
Merge pull request #14031 from atm-florianm/10.0_FIX_copy_payment_value_date_on_account_line
FIX: copy value date of VariousPayment onto the new AccountLine
2020-06-06 21:19:11 +02:00
Laurent Destailleur
2140f05eb4
Merge pull request #14040 from aspangaro/10.0_p40
FIX: Accountancy - Binding index - Add a filter on sql request for module Subtotal & Jalon
2020-06-06 21:01:40 +02:00
florian HENRY
0943b13ecc Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0 2020-06-06 17:51:31 +02:00
Marc Guenneugues
cefc8dcca2 replenish : select expedition quantities only from opened orders when using virtual stocks 2020-06-06 11:39:49 +02:00
Laurent Destailleur
5dd9f4e4c4 Fix travis false positive 2020-06-06 11:36:24 +02:00
Laurent Destailleur
2344435416 Fix XSS CWE-ID CWE-79 2020-06-05 23:41:29 +02:00
Laurent Destailleur
4fcaaa3387 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-06-05 17:48:02 +02:00
Laurent Destailleur
ca3f62e4ac Doc repair Row size too large 2020-06-05 17:47:52 +02:00
Alexandre SPANGARO
e5f8f38fbf FIX: Accountancy - Binding index - Add a filter on sql request for module Subtotal & Jalon 2020-06-05 17:24:59 +02:00
VESSILLER
ded7b79a6f FIX free text on cash desk 2020-06-05 12:10:03 +02:00
florian HENRY
699557adbe forget[] 2020-06-04 21:39:23 +02:00
florian HENRY
afafe1a737 forget[] 2020-06-04 21:38:44 +02:00
florian HENRY
29649a1e2a Merge branch '11.0' of github.com:atm-florian/dolibarr into 11.0 2020-06-04 20:21:17 +02:00
stickler-ci
e9b17aac8d Fixing style errors. 2020-06-04 18:20:48 +00:00
florian HENRY
b47761e05c fix comment 2020-06-04 20:20:43 +02:00
florian HENRY
ca4a1dc266 Merge branch '11.0' of github.com:atm-florian/dolibarr into 11.0 2020-06-04 20:18:46 +02:00
florian HENRY
9a3e68b594 Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0 2020-06-04 20:14:29 +02:00
florian HENRY
7115bd7033 better fix 2020-06-04 20:14:19 +02:00
Laurent Destailleur
eb7dd74026 Revert error 2020-06-04 16:05:40 +02:00
Laurent Destailleur
88f6c71e88 Add tuto for live streaming 2020-06-04 16:05:04 +02:00
Florian Mortgat
c393f8149c FIX: when creating a VariousPayment, the value date is not copied onto the AccountLine that gets created at the same time, so the bank transaction's value date will be the payment date instead of the payment's value date 2020-06-04 11:29:51 +02:00
Alexandre SPANGARO
ede084a111 Fix stickler 2020-06-04 05:11:00 +02:00
Maxime Kohlhaas
f6e0ed08e2 Fix #14027 : emptying social network value on contact wasn't working 2020-06-04 00:30:17 +02:00
Maxime Kohlhaas
e19f496d62 Fix missing test on module enabled for user validators 2020-06-03 23:30:06 +02:00
Alexandre SPANGARO
9e5c7d0acf FIX: Show ref_customer, amount on contract link object 2020-06-03 23:00:53 +02:00
gauthier
68bb552dcc FIX : Tickets mail models doesn't work 2020-06-02 17:06:49 +02:00
Laurent Destailleur
da481049c1
Update commonobject.class.php 2020-06-02 15:45:40 +02:00
Laurent Destailleur
f91e7e4917
Merge pull request #13922 from atm-lena/11.0_NEW_AddHook_SelectWarehouses
11.0 new add hook select warehouses
2020-06-02 13:27:01 +02:00
Laurent Destailleur
009780b895
Update html.formproduct.class.php 2020-06-02 12:13:55 +02:00
Laurent Destailleur
88a831c05a
Update html.formproduct.class.php 2020-06-02 12:12:07 +02:00
atm-lena
ae9c490134 Merge branch '11.0' of https://github.com/Dolibarr/dolibarr into 11.0_NEW_AddHook_SelectWarehouses 2020-06-02 09:55:56 +02:00
atm-lena
99b4bfc91e Movement of hook "selectwarehouse" 2020-06-02 09:53:30 +02:00
Laurent Destailleur
6cc512ea16
Merge pull request #14016 from atm-florianm/FIX_11.0_check_file_exists_after_pdftk_massgeneration
FIX 11.0 - when using pdftk for pdf concatenation, check if file was created before saying so
2020-06-01 20:10:08 +02:00
Florian Mortgat
3213148d87 FIX 11.0 - when using pdftk as per hidden conf USE_PDFTK_FOR_PDF_CONCAT, check that the file exists before displaying a success message 2020-06-01 17:12:02 +02:00
florian HENRY
c655720b78 fix travis 2020-06-01 10:51:50 +02:00
florian HENRY
2337d75d92 better fix for #13968 2020-06-01 10:43:57 +02:00
florian HENRY
face2d644e Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0 2020-06-01 10:05:07 +02:00
Laurent Destailleur
2b317120d3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/facture/card.php
2020-05-31 00:25:33 +02:00
Laurent Destailleur
bc1724a3aa Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-31 00:23:40 +02:00
Laurent Destailleur
4303d3d3e8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/margin/tabs/productMargins.php
2020-05-31 00:23:33 +02:00
Laurent Destailleur
2696a6a4d0
Merge pull request #14000 from OPEN-DSI/fix_erreur_facture_v10
FIX: Fix link of the button to create a credit note and fix the awareness of a error happen when to create a credit note
2020-05-30 17:24:08 +02:00
Laurent Destailleur
52af430ae2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-30 14:20:16 +02:00
Laurent Destailleur
e223189507 FIX #14002 2020-05-30 14:20:04 +02:00
kamel
1e208e537f FIX: Fix link of the button to create a credit note and fix the awareness of a error happen when to create a credit note 2020-05-29 16:24:07 +02:00
Laurent Destailleur
113144ea21
Merge pull request #13993 from glu000/11.0-fix-13991
Fix #13991
2020-05-28 18:27:39 +02:00
Laurent Destailleur
3ae61fcd73
Merge pull request #13981 from atm-florianm/11.0_FIX_pgsql_error_in_adherents_module
11.0 FIX postgreSQL error on landing page when "members" module is on
2020-05-28 17:50:08 +02:00
Laurent Destailleur
c3f75ba2ec
Merge pull request #13989 from atm-lena/11.0_FIX_RoundingTotalTVA_PDFCrabeModel
FIX Rounding Total TVA in "crabe" model pdf
2020-05-28 17:38:52 +02:00
Laurent Destailleur
8360ca4b20
Update pdf_crabe.modules.php 2020-05-28 17:38:20 +02:00
Laurent Destailleur
bdc73b5cae
Update pdf_crabe.modules.php 2020-05-28 17:37:53 +02:00