Commit Graph

89109 Commits

Author SHA1 Message Date
Francis Appels
df297f89d0 Merge remote-tracking branch 'Dolibarr/12.0' into 12 2020-06-22 11:31:18 +02:00
Regis Houssin
32844a8d0c FIX clean code 2020-06-22 09:26:42 +02:00
lvessiller
bf338b4d4f NEW show links for select and multi-select in category extra field 2020-06-22 08:57:52 +02:00
Laurent Destailleur
4cfb9dc7c5 css 2020-06-22 04:40:04 +02:00
Laurent Destailleur
058a0d4fa7 Fix look and feel v12 2020-06-22 04:27:16 +02:00
Laurent Destailleur
d816d45331 Look and feel v13 2020-06-22 04:10:13 +02:00
Laurent Destailleur
cdd4ed5b3d Update doc 2020-06-22 01:20:45 +02:00
Laurent Destailleur
984e3d112d Fix packager 2020-06-22 01:10:41 +02:00
Laurent Destailleur
1ce5b78a6b Fix error message not reported 2020-06-22 01:02:17 +02:00
Laurent Destailleur
119bf45177 Fix error in packaging 2020-06-22 00:41:21 +02:00
Laurent Destailleur
8ccaa0794e Update doc 2020-06-21 22:58:52 +02:00
Laurent Destailleur
0a22773eab Update doc 2020-06-21 22:58:08 +02:00
Regis Houssin
9a4f5e3d9a FIX We force "modify" for avoid some field not modify 2020-06-21 21:10:51 +02:00
Laurent Destailleur
0139a840ae Fix setup 2020-06-21 20:49:34 +02:00
Laurent Destailleur
501fd2f7a3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/takepos/admin/receipt.php
2020-06-21 20:48:41 +02:00
Laurent Destailleur
502c76fcfc log 2020-06-21 20:45:35 +02:00
Regis Houssin
03fbd72d66 FIX For better compatibility with Samba4 AD 2020-06-21 19:52:15 +02:00
Marc Guenneugues
f86f4c1e1d Change label of checkbox to be more explicit 2020-06-21 19:02:20 +02:00
Laurent Destailleur
cdcc87a565 Fix lang 2020-06-21 15:25:34 +02:00
Laurent Destailleur
d84fbb7165 css 2020-06-20 18:59:13 +02:00
Laurent Destailleur
3a0f950ad0 Fix phpcs 2020-06-20 18:46:49 +02:00
Laurent Destailleur
bb3320f103 FIX #14104 2020-06-20 18:34:19 +02:00
Laurent Destailleur
fe1f88d2ac FIX #14092 #14093 2020-06-20 16:09:53 +02:00
Laurent Destailleur
ccc55dcb1e Debug Receipt printer module and reduce duplicate translation key 2020-06-20 15:19:19 +02:00
Laurent Destailleur
871ba8d08c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-20 12:28:23 +02:00
Laurent Destailleur
c54294285a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
2020-06-20 12:28:14 +02:00
Laurent Destailleur
b54c18730b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
2020-06-20 12:25:08 +02:00
Laurent Destailleur
03b540b948 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2020-06-20 12:23:04 +02:00
andreubisquerra
515d18020d Add security check 2020-06-20 12:21:14 +02:00
andreubisquerra
532fe82c6e Fix travis 2020-06-20 12:21:06 +02:00
jove@bisquerra.com
ad432e1e9b Printable QR 2020-06-20 12:20:53 +02:00
Laurent Destailleur
70039d0c41 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-20 12:19:36 +02:00
Laurent Destailleur
450c340cb1 Trans 2020-06-20 12:19:25 +02:00
Laurent Destailleur
f4d0cdcec0
Merge pull request #14083 from andreubisquerra/master
Printable QR in TakePOS
2020-06-20 12:18:59 +02:00
Laurent Destailleur
c919d3d5aa
Merge pull request #14100 from atm-florian/12_fixAdvTargetTplWarning
fix: warning and clean old code about multiselect category for advtarget tpl
2020-06-20 12:18:35 +02:00
Laurent Destailleur
378db9ab9a
Merge pull request #14099 from atm-florian/12.0
fix: same feature on thirdparty extrafields transport to invoice as existing on orders
2020-06-20 12:16:57 +02:00
Laurent Destailleur
5a53a16c17
Merge pull request #14101 from mistraloz/patch-5
Fix: Bug when delete payment when already deleted in account
2020-06-20 12:15:59 +02:00
Laurent Destailleur
da9c25348e
Update paiement.class.php 2020-06-20 12:15:48 +02:00
Laurent Destailleur
8eb23c5ee5
Merge pull request #14103 from atm-florian/12_fix_invoicelist_filterbySalesRep
fix f.fk_user_author unknow because after stange join with coma
2020-06-20 12:14:48 +02:00
andreubisquerra
7de9aa2398
Add security check 2020-06-20 11:25:54 +02:00
Laurent Destailleur
2de3eb8ac0 Fix CSS 2020-06-20 00:00:17 +02:00
Laurent Destailleur
1ce3991d81 FIX #14036 2020-06-19 23:17:22 +02:00
Laurent Destailleur
5ac80844cb FIX #14036 2020-06-19 23:15:40 +02:00
Laurent Destailleur
d632f1c6b2 Fix url 2020-06-19 23:08:29 +02:00
Laurent Destailleur
d8927143fa Fix chrome style 2020-06-19 20:01:57 +02:00
Laurent Destailleur
f24e73141e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-19 14:53:31 +02:00
Laurent Destailleur
15af3d68fc FIX #13877 2020-06-19 14:50:33 +02:00
Laurent Destailleur
989737af6b Update website templates 2020-06-19 10:36:19 +02:00
florian HENRY
07923e0baf fix f.fk_user_author unknow because after stange join with coma 2020-06-19 10:08:19 +02:00
florian HENRY
c2920083d8 Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12_fixAdvTargetTplWarning 2020-06-19 09:49:50 +02:00