lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
102,552 Commits 43 Branches 150 Tags 886 MiB
d9907fe074
Commit Graph

90553 Commits

Author SHA1 Message Date
atm-greg
bc8ea7571b perms can be an expression and must be evaluated 2022-02-28 18:38:37 +01:00
atm-greg
5eef80750a fiw visibility can be an expression and can return 0 2022-02-28 18:37:47 +01:00
Regis Houssin
9cf5bccf43 FIX options should not exists on invoices 2022-02-28 18:13:29 +01:00
Alexandre SPANGARO
18a8eac1cd Modify fix 2022-02-26 07:17:44 +01:00
Laurent Destailleur
b989c257ad Fix report on salaries 2022-02-25 18:53:21 +01:00
Laurent Destailleur
a6a6c588db Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-25 14:37:28 +01:00
Laurent Destailleur
ac67a5a2bb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-25 14:34:25 +01:00
Laurent Destailleur
971c0fc764
Merge pull request #20147 from Hystepik/develop_safe_v14 
Fix : fix error of permission in holiday
 2022-02-25 14:30:05 +01:00
Laurent Destailleur
eb6383ff1d
Merge pull request #20165 from atm-lena/FIX_SalaryPaiement_RapportCompta 
Display Salary Paiement on compta report
 2022-02-25 14:02:32 +01:00
Thomas Negre
4d2dde0fe4 fix bookmarks info bubble 2022-02-24 14:38:28 +01:00
atm-lena
ed6f4b4ee1 Display Salary Paiement on compta report 2022-02-23 15:33:51 +01:00
Alexandre SPANGARO
0510d84263 FIX Invoice - When you create an invoice and defined a thirdparty, fk_account is not retrieved from company card 2022-02-23 06:08:20 +01:00
Laurent Destailleur
73b04deb19 Fix error management. 2022-02-23 00:17:49 +01:00
Marc de Lima Lucio
0e0dd1ec6c FIX: invoice pdf: lines originating from deposits were not detailed anymore 2022-02-22 17:42:11 +01:00
Marc de Lima Lucio
1574254dcf FIX: viewimage.php: bad call to dol_check_secure_access_document() caused images to be blocked with multicompany from entities > 1 2022-02-22 17:13:26 +01:00
stickler-ci
19dbed1804 Fixing style errors. 2022-02-22 16:10:56 +00:00
lmarcouiller
65ecd2f3ef Fix : fix error of permission in holiday 2022-02-22 17:06:10 +01:00
Laurent Destailleur
aa8932a3a4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-22 10:59:02 +01:00
Laurent Destailleur
6b29b2d9dc Add preg_quote 2022-02-22 10:51:51 +01:00
atm-greg
7b655a1ae2 fix missing hooks and line total for totalizable extrafields 2022-02-21 11:25:28 +01:00
Laurent Destailleur
e948db69f2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-18 21:46:01 +01:00
Laurent Destailleur
28d8a28be6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-18 21:45:54 +01:00
Laurent Destailleur
959aa0ce59 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-02-18 21:44:34 +01:00
Laurent Destailleur
c770e232ff
Merge pull request #20120 from RomainDeschamps/14.0 
Add ticket page in user personal landpage
 2022-02-18 21:09:23 +01:00
Laurent Destailleur
1c129fd3ea
Merge pull request #20038 from atm-quentin/FIX_12_sort_ht_amount 
FIX sort amount ht on cabyprodserv.php
 2022-02-18 21:04:52 +01:00
Laurent Destailleur
72df61b175
Merge pull request #20107 from henrynopo/patch-2 
Fix bug - List of supplier order - to show total line
 2022-02-18 20:42:30 +01:00
Laurent Destailleur
91eafaea98
Merge pull request #20109 from aspangaro/14p33 
FIX Accountancy - On manual transaction with multicompany - Function transformTransaction can validate & delete transaction of an other entity
 2022-02-18 20:21:43 +01:00
Laurent Destailleur
19f51347ea
Merge pull request #20111 from atm-greg/Fix_14.0_price_extrafields_rounding_and_currency 
fix rounding for price and display currency
 2022-02-18 20:19:02 +01:00
Romain DESCHAMPS
5eb4d3408c Update param_ihm.php 2022-02-18 19:31:42 +01:00
lvessiller
1107a60b58 FIX compute rule in FEC import 2022-02-18 16:53:55 +01:00
stickler-ci
b5afa27774 Fixing style errors. 2022-02-18 10:09:38 +00:00
atm-greg
12c825ba84 fix rounding for price and display currency 2022-02-18 10:50:00 +01:00
Alexandre SPANGARO
3f109aa911 FIX Accountancy - On manual transaction with multicompany - Function transformTransaction can validate & delete transaction of an other entity 2022-02-18 09:24:12 +01:00
Henry
c32cc660a3
Update list.php 2022-02-18 08:16:56 +08:00
Laurent Destailleur
28e6acdae3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-17 20:46:36 +01:00
Laurent Destailleur
aacd439765 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/api/class/api_setup.class.php
 2022-02-17 20:46:20 +01:00
Laurent Destailleur
80f1cd8857 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-02-17 20:43:51 +01:00
Laurent Destailleur
edc984c6e3 # WARNING: head commit changed in the meantime 
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
 2022-02-17 20:43:22 +01:00
Laurent Destailleur
64ddead1b5
Merge pull request #20051 from ptibogxiv/patch-3 
FIX API REST for setup values
 2022-02-17 20:05:17 +01:00
Laurent Destailleur
2f3411a31b
Merge pull request #20044 from atm-arnaud/FIX_societe_create_user_author 
FIX wrong user author
 2022-02-17 19:54:53 +01:00
Laurent Destailleur
7e33794f66
Merge pull request #20047 from simicar29/14-dolistore 
Fix urlencode breaking links in Market Place page
 2022-02-17 19:54:04 +01:00
Laurent Destailleur
511aee6005
Merge pull request #20057 from aspangaro/14p31 
FIX Accountancy - Order by accounting account on summary page
 2022-02-17 19:44:59 +01:00
Laurent Destailleur
f1d84f5728
Merge pull request #20060 from hregis/fix_missing_default_or_current_value 
FIX missing default or current value
 2022-02-17 19:43:29 +01:00
Laurent Destailleur
2e744a4517
Update create_ticket.php 2022-02-17 19:18:22 +01:00
Laurent Destailleur
c529af90c6 Fix trans 2022-02-17 12:06:48 +01:00
Thomas Negre
1c8c98ac0f fix ticket public interface: 
When sending an email to the customer,
If a custom URL had been provided for ticket public interface,
the link provided in the email did lead to the index of the public interface.
We want it to lead to /view.php
 2022-02-17 09:53:36 +01:00
Laurent Destailleur
c3733a92e1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
 2022-02-16 21:22:49 +01:00
Laurent Destailleur
eb8caf7419 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-02-16 21:17:19 +01:00
Laurent Destailleur
c16e013b99 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
 2022-02-16 21:13:49 +01:00
Laurent Destailleur
ed10db668d
Merge pull request #20073 from atm-quentin/FIX_13_combinations 
FIX weight is lost if it's comma on combinations card
 2022-02-16 20:34:24 +01:00
Laurent Destailleur
906651d404 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-16 20:27:26 +01:00
Laurent Destailleur
e0563d2bef Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-16 20:27:07 +01:00
Laurent Destailleur
7029bb7000
Merge pull request #20077 from AlexisLaurier/bugfix/paymentByBankTransfertIndexTabEntity 
add missing entity check on list of withdraws on index of paymentbyba…
 2022-02-16 20:26:39 +01:00
Laurent Destailleur
a33ca21151
Merge pull request #20079 from AlexisLaurier/bugfix/fixPrelevmentLineDetails-ForBankPaymentTransfert 
manage details of prelevment line for bank transfer
 2022-02-16 20:22:54 +01:00
Laurent Destailleur
645bf9564e
Merge pull request #20084 from altairis-noe/stock_doc14 
FIX: correct warehouse document location
 2022-02-16 20:18:43 +01:00
Laurent Destailleur
357f6e234a
Merge pull request #20086 from altairis-noe/duplicate_serial_move_trans 
FIX : translation string instead of error message text
 2022-02-16 20:18:01 +01:00
Florian
aa2a57ff95 Check that the value is not an array 2022-02-16 17:00:54 +01:00
Florian
7ed6ca6ec6 FIX ISSUE DB_ERROR_SYNTAX-#18921 2022-02-16 17:00:50 +01:00
Noé Cendrier
98c50f531c translation string instead of error message text 2022-02-16 15:57:39 +01:00
Alexis LAURIER
ff8dcdc4b7 manage details of prelevment line for bank transfer 2022-02-16 10:52:20 +01:00
Alexis LAURIER
8b0280a9d2 add missing entity check on list of withdraws on index of paymentbybanktransfert 2022-02-16 10:26:44 +01:00
Quentin VIAL-GOUTEYRON
82b3d89923 FIX wieght is loose if it's comma on combinations 2022-02-15 11:31:09 +01:00
Laurent Destailleur
0e664cc969 Fix API call from ajax 2022-02-15 11:12:08 +01:00
atm-greg
96c7a9f77c fix pdf_cornas 2022-02-14 15:16:36 +01:00
atm-greg
3ebdb89133 fix pdf_mucadet 2022-02-14 15:11:26 +01:00
Regis Houssin
15b7f37027 FIX missing default or current value 2022-02-14 09:14:06 +01:00
Alexandre SPANGARO
9349e2df7c FIX Accountancy - Order by accounting account on summary page 2022-02-13 21:11:45 +01:00
ptibogxiv
8d3e97bab9
Update api_setup.class.php 2022-02-12 19:21:07 +01:00
ptibogxiv
11e15255bd
FIX API REST for setup values 2022-02-12 16:59:29 +01:00
Marc GUENNEUGUES
c552030b69 Fix urlencode breaking links in Market Place page 2022-02-11 15:18:38 +01:00
atm-arnaud
455247565d FIX wrong user author 2022-02-11 11:40:45 +01:00
Noé Cendrier
664860863e correct warehouse document location 2022-02-10 17:59:12 +01:00
Quentin VIAL-GOUTEYRON
d819d427c3 FIX sort amount ht 2022-02-10 16:46:19 +01:00
Laurent Destailleur
8db6152a4d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-10 11:23:00 +01:00
Laurent Destailleur
6c8fafddf6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-02-10 11:22:31 +01:00
Laurent Destailleur
7a1c4172a6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-02-10 11:20:09 +01:00
Laurent Destailleur
d0f3274570
Merge pull request #19979 from ATM-Consulting/FIX_14.0_error_converttoreduc_with_multicurrency 
fix bad array index for multicurrency
 2022-02-10 10:56:42 +01:00
Regis Houssin
faec54ba3b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into fix_wrong_div_name 2022-02-10 10:18:45 +01:00
Regis Houssin
3eabeb2380 FIX broken feature, wrong div name again 2022-02-10 10:18:06 +01:00
Laurent Destailleur
65b81eddf4
Merge pull request #20000 from aspangaro/14p31 
FIX Propal - Missing field import_key in import propal line
 2022-02-10 10:17:41 +01:00
Laurent Destailleur
d5d34930a8
Update card.php 2022-02-10 09:58:08 +01:00
Regis Houssin
8dffa020b4 FIX broken feature, wrong div name 2022-02-10 09:54:09 +01:00
Laurent Destailleur
793e43c7c6
Update fournisseur.commande.class.php 2022-02-10 09:29:11 +01:00
noec764
d9bac75a63
Merge branch '12.0' into 12.0_Fix_Double_CommandeFournisseurDet 2022-02-09 15:33:45 +01:00
Noé Courtier
e4c1978e12 Change of SQL request when fetching CommandeFournisseurLigne 2022-02-09 12:24:33 +01:00
atm-greg
4c6fd42e3a fix with eldy recommendations 2022-02-09 09:47:48 +01:00
Laurent Destailleur
c496e6eb51 doc 2022-02-07 20:53:13 +01:00
Florian HENRY
30779be77e fix: if capital is not numeric just display input value 2022-02-07 16:36:47 +01:00
Florian HENRY
228142684b fix: if capital is not numeric just display input value 2022-02-07 16:33:27 +01:00
Alexandre SPANGARO
3e4150fbc2 Translation 2022-02-07 05:02:59 +01:00
Alexandre SPANGARO
ea83b9c11c FIX Propal - Missing field import_key in import propal line 2022-02-06 13:56:57 +01:00
Laurent Destailleur
63d35ecffd Fix phpcs 2022-02-04 19:05:11 +01:00
Laurent Destailleur
e57bc01466 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/product/class/product.class.php
 2022-02-04 13:02:45 +01:00
Laurent Destailleur
3f87db08d4
Update product.class.php 2022-02-04 12:55:31 +01:00
El-dge
d09303d27c
Issue on stock virtuel : fix Dolibarr/dolibarr#18634 2022-02-04 12:31:40 +01:00
Laurent Destailleur
15dca77330 Fix filter on search_categ 2022-02-04 11:00:16 +01:00
Laurent Destailleur
95833135f4 FIX #19974 2022-02-04 10:44:19 +01:00
Laurent Destailleur
ff39bcb058
Merge pull request #19975 from ksar-ksar/patch-13 
FIX #19974 : llx_onlinesignature.sql allready exist
 2022-02-04 10:35:56 +01:00
atm-greg
6035a374b7 fix bad array index 2022-02-02 14:44:38 +01:00
Laurent Destailleur
815dd74de0 Fix missing information propagated to trigger 2022-02-02 14:07:31 +01:00