Commit Graph

77600 Commits

Author SHA1 Message Date
Laurent Destailleur
23de8694fa Fix module files 2019-10-07 12:37:01 +02:00
Laurent Destailleur
b9ac8295d4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-07 12:28:06 +02:00
Laurent Destailleur
55508e25ec Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-07 12:27:06 +02:00
VESSILLER
219b0d8925 FIX Import of product using units 2019-10-07 12:26:02 +02:00
Laurent Destailleur
3d20766392
Merge pull request #12047 from frederic34/patch-15
translation for holidays actioncomm
2019-10-07 10:23:29 +02:00
Laurent Destailleur
753da4791e FIX Pb in units of shipments
Conflicts:
	htdocs/expedition/card.php
2019-10-06 16:31:17 +02:00
Laurent Destailleur
fb808d830e FIX Look and feel v10 2019-10-06 16:28:14 +02:00
Laurent Destailleur
6c1c008d09 FIX Look and feel v10 2019-10-06 16:28:10 +02:00
Frédéric FRANCE
52da21912b
Update agenda.lang 2019-10-06 13:21:04 +02:00
Frédéric FRANCE
21dcc549fa
translation for holidays actioncomm 2019-10-06 10:09:06 +02:00
Laurent Destailleur
ac8837d01f Fix url 2019-10-05 19:28:00 +02:00
Laurent Destailleur
7f5ccf4b8e Remove google+ 2019-10-05 19:27:14 +02:00
Laurent Destailleur
3e5cd877b8 FIX Bad list of ticket on public interface for ticket emailcollector 2019-10-05 14:27:42 +02:00
Laurent Destailleur
e90234c2bc FIX escape email alias 2019-10-05 14:27:37 +02:00
Laurent Destailleur
083db12490 FIX access to public interface when origin email has an alias. 2019-10-05 11:53:08 +02:00
Laurent Destailleur
a06b1b9f3f Fix escaping chars 2019-10-05 11:43:28 +02:00
Laurent Destailleur
8bf9afb7ca FIX Attachement of linked files on ticket when sending a message 2019-10-04 19:41:35 +02:00
Laurent Destailleur
503973cec9 FIX Edit of ticket module parameters erased others 2019-10-04 14:04:31 +02:00
Laurent Destailleur
c3fa770871 FIX Filter "Open all" of ticket was ko. 2019-10-04 13:06:24 +02:00
Laurent Destailleur
68c28ab3c7 FIX Look and feel v10 2019-10-04 12:31:25 +02:00
Laurent Destailleur
0b9d27423d FIX Can't modify vendor invoice if transfered into accountancy 2019-10-04 10:31:57 +02:00
Laurent Destailleur
6cd3d27885 Fix comparison 2019-10-04 09:54:52 +02:00
Laurent Destailleur
b787e53020 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-03 17:54:58 +02:00
Laurent Destailleur
1a66e0b05e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/product/card.php
2019-10-03 17:53:59 +02:00
Laurent Destailleur
d9aa816197 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-03 17:52:06 +02:00
Laurent Destailleur
75be637b0b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-03 17:50:57 +02:00
Laurent Destailleur
7412335217
Merge pull request #12031 from atm-lena/8.0_fix_missingbegin
FIX missing begin()
2019-10-03 17:50:35 +02:00
atm-lena
ae01bd8f07 FIX missing begin() 2019-10-03 17:23:16 +02:00
Laurent Destailleur
9762d77958
Merge pull request #12024 from frederic34/patch-17
Update dolgraph.class.php
2019-10-03 15:57:48 +02:00
Laurent Destailleur
03614536f9
Merge pull request #12018 from frederic34/patch-12
backport commit for setmulticurrency
2019-10-03 15:54:01 +02:00
Frédéric FRANCE
0d41216624
Update dolgraph.class.php 2019-10-03 00:22:14 +02:00
Frédéric FRANCE
ad3cbd17c2
backport commit for setmulticurrency
a489207122 (diff-48f18024fb928ce21b76ef02fc967c67)
2019-10-02 11:12:30 +02:00
Laurent Destailleur
4928a999a0
Merge pull request #11933 from atm-gauthier/fix_conf_to_allow_changeproducttype
FIX : change product type must be allowed if we activate hidden conf
2019-10-01 14:41:52 +02:00
Laurent Destailleur
d448998762
Update card.php 2019-10-01 14:41:25 +02:00
Laurent Destailleur
d6198a1e33 Fix billed time is empty 2019-10-01 13:47:29 +02:00
Laurent Destailleur
2d42afc686 FIX Filter on project on ticket list 2019-10-01 12:36:39 +02:00
Laurent Destailleur
9b607a3105 FIX navigation on ticket tab of projects 2019-10-01 12:29:58 +02:00
Frédéric FRANCE
64381ac4d6 Update api_boms.class.php 2019-10-01 11:37:29 +02:00
Laurent Destailleur
956b46d920 Fix warnings 2019-10-01 11:37:15 +02:00
Frédéric FRANCE
7872a93605 Update box_commandes.php 2019-10-01 11:36:33 +02:00
Frédéric FRANCE
4ff65ce586 Update box_supplier_orders.php 2019-10-01 11:36:29 +02:00
Frédéric FRANCE
d201515514 Update box_prospect.php 2019-10-01 11:36:24 +02:00
Laurent Destailleur
322786cabe Look and feel v10 2019-10-01 11:36:06 +02:00
Laurent Destailleur
15e646cc62 Fix bad name of trigger 2019-10-01 11:34:35 +02:00
Laurent Destailleur
6ee17022c0 Fix bad key for type of contact of resources 2019-10-01 11:34:01 +02:00
gauthier
2167e7ed98 FIX : hidden conf to prevent from changing product_type 2019-10-01 09:12:51 +02:00
Laurent Destailleur
4f356fa412
Merge pull request #11859 from altatof/avoir
FIX : allow standalone credit note even if no invoice
2019-09-30 18:12:55 +02:00
Laurent Destailleur
945dd0ae89
Update card.php 2019-09-30 18:12:43 +02:00
Laurent Destailleur
29d941cb6e
Merge pull request #11918 from atm-gauthier/8.0_fix_discount_visibility_follows_invoice_sharing
FIX : If we share invoice, we need to see discount created from a deposit on each entity
2019-09-30 18:04:07 +02:00
Laurent Destailleur
d2881eb85b FIX CSS
Conflicts:
	htdocs/core/tpl/extrafields_list_search_input.tpl.php
2019-09-29 19:26:37 +02:00