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

90469 Commits

Author SHA1 Message Date
Romain DESCHAMPS
5eb4d3408c Update param_ihm.php 2022-02-18 19:31:42 +01: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
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