Commit Graph

83285 Commits

Author SHA1 Message Date
Laurent Destailleur
e9e0ce591b
Merge pull request #13379 from atm-lena/11.0_FIX_extrafields_add_tpl_include
FIX : wrong include - replace extrafields_create.tpl.php to extrafiel…
2020-03-18 18:26:57 +01:00
Laurent Destailleur
c1931a045e
Merge pull request #13376 from fmarcet/11.0
FIX: Bank movements color is not showing
2020-03-18 18:22:46 +01:00
Laurent Destailleur
a848a8523a
Merge pull request #13377 from atm-john/11.0_fix_situations_invoices_stuff
Fix situations invoices stuff
2020-03-18 18:20:27 +01:00
Laurent Destailleur
cc93a40c45 Fix label of local tax 2020-03-18 14:06:15 +01:00
Laurent Destailleur
56e4fa1bb3 Trans 2020-03-18 14:01:11 +01:00
ATM john
c767e553d3 fix import line from object default value for situations 2020-03-18 10:59:13 +01:00
ATM john
4f1dd5439f Merge branch '11.0_fix_situations_invoices_stuff' of github.com:atm-john/dolibarr into 11.0_fix_situations_invoices_stuff 2020-03-18 10:35:49 +01:00
ATM john
7b8cafb710 remove var_dump 2020-03-18 10:34:44 +01:00
stickler-ci
0a5f971eb5 Fixing style errors. 2020-03-18 09:32:34 +00:00
ATM john
d3aeec0a7c Fix situation value transmission 2020-03-18 10:30:15 +01:00
atm-lena
2e1554def4 FIX : wrong include - replace extrafields_create.tpl.php to extrafields_add.tpl.php 2020-03-18 10:18:52 +01:00
Ferran Marcet
1fe4e4415e FIX: Bank movements color is not showing 2020-03-18 09:27:08 +01:00
ATM john
075757eb3d Fix situation value transmission 2020-03-17 16:49:05 +01:00
ATM john
cb43928a5d Fix radio label target 2020-03-17 12:29:14 +01:00
florian HENRY
1d05531aa8 fix wrong DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_ called 2020-03-17 10:10:54 +01:00
Pierre Ardoin
26f6f04486
forgot ";" 2020-03-17 10:08:18 +01:00
Pierre Ardoin
564f412957
correction due to comments @hregis and @eldy 2020-03-17 10:04:43 +01:00
Laurent Destailleur
ee29125579 typo 2020-03-15 11:29:00 +01:00
Laurent Destailleur
8927d40cc4 Prepare 11.0.3 2020-03-15 11:28:00 +01:00
Laurent Destailleur
37fce0d3ee Fix position on merou
Fix preselected value on contact
2020-03-14 14:45:37 +01:00
Laurent Destailleur
8192e9dc67 FIX Missing token in form 2020-03-14 03:02:49 +01:00
Laurent Destailleur
8a9553522f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-14 00:14:52 +01:00
Laurent Destailleur
f774733fcb Sync transifex 2020-03-14 00:14:42 +01:00
Laurent Destailleur
6948e347c4
Merge pull request #13329 from atm-florian/fix_11_multiEntityOnCommCardElement
Fix 11 multi entity on comm card element
2020-03-13 16:57:10 +01:00
Laurent Destailleur
4841a5bf4a Fix look and feel v11 2020-03-13 16:53:37 +01:00
florian HENRY
ca269864f7 let keep it to expedition 2020-03-13 14:55:34 +01:00
Laurent Destailleur
1ff102f62a Prepare 11.0.3 2020-03-13 10:31:28 +01:00
Laurent Destailleur
864c903d05 FIX #13294 2020-03-12 18:55:08 +01:00
Laurent Destailleur
7e428885cc Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-12 18:34:43 +01:00
Laurent Destailleur
74b8b9f47d
Merge pull request #13340 from atm-lena/11.0_FIX_loadCacheMsgTicket_PrivateStatus
FIX - Ticket Public  - Private messages are displayed
2020-03-12 17:59:13 +01:00
Laurent Destailleur
6d9967a5d3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-12 17:59:03 +01:00
Laurent Destailleur
dea03efd4f Look and feel v11 2020-03-12 17:58:51 +01:00
Laurent Destailleur
09359b8025
Merge pull request #13338 from altatof/box_shipments
FIX : missing class declaration
2020-03-12 17:06:50 +01:00
Laurent Destailleur
aa3b28a8be
Merge pull request #13337 from simicar29/11.0
Load line extrafields when fetching supplier invoice
2020-03-12 17:06:26 +01:00
atm-lena
ca121dd689 FIX - Ticket - Load Cache Messages Ticket, wrong message's status 2020-03-12 16:21:11 +01:00
altairis
6618205e6f fix missing class declaration 2020-03-12 15:05:32 +01:00
simicar29
4f4b778c8c
update_price: add invoice_supplier element name
'invoice_supplier' as an element name was missing in test conditions to skip the update_price function
2020-03-12 12:53:17 +01:00
stickler-ci
0babab2824 Fixing style errors. 2020-03-12 11:48:08 +00:00
simicar29
95efdab62a
Merge pull request #4 from simicar29/simicar29-patch-5
Load line extrafields when fetching supplier invoice
2020-03-12 12:44:31 +01:00
simicar29
325d635c48
Load line extrafields when fetching supplier invoice
PR to load extrafield values of lines when fetchinf supplier invoice.
2020-03-12 12:43:06 +01:00
Laurent Destailleur
dfe947885c FIX params of setEventMessage($langs->trans('ErrorProductClone')... 2020-03-12 12:40:28 +01:00
Laurent Destailleur
5dc403cb66 FIX #13304 2020-03-12 12:19:24 +01:00
Laurent Destailleur
ad22820872 FIX #13313 2020-03-12 12:15:44 +01:00
florian HENRY
6edaa7ac11 fix getentity on comm/card.php 2020-03-11 18:00:35 +01:00
florian HENRY
c4610fee8b Merge branch '11.0' of github.com:Dolibarr/dolibarr into fix_11_multiEntityOnCommCardElement 2020-03-11 17:58:51 +01:00
florian HENRY
f40c8ce507 fix getentity on comm/card.php 2020-03-11 17:58:41 +01:00
Laurent Destailleur
4903287204 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/boxes/box_commandes.php
	htdocs/fourn/class/fournisseur.commande.class.php
2020-03-11 17:04:28 +01:00
Laurent Destailleur
27bdee9df1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-11 17:01:47 +01:00
Laurent Destailleur
c9b715b7ad Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-11 17:01:31 +01:00
Laurent Destailleur
7afbb5ce9c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-03-11 17:00:01 +01:00