Commit Graph

89109 Commits

Author SHA1 Message Date
ptibogxiv
1368236d29
Update card.php 2019-09-08 20:15:05 +02:00
ptibogxiv
a83c067081
Update card.php 2019-09-08 20:08:32 +02:00
ptibogxiv
2d3b0a7d43
Update adherent.class.php 2019-09-08 20:05:13 +02:00
ATM john
a639724b92 Fix follow tasks and time spent 2019-09-08 18:13:15 +02:00
ATM john
fa5cda2e88 Fix missing total progress column 2019-09-08 18:03:14 +02:00
Alexandre SPANGARO
985cfab8e9 Traduction 2019-09-08 05:22:13 +02:00
Alexandre SPANGARO
3ddd123eb1 Traduction 2019-09-08 05:18:52 +02:00
david
48b2a11da2 FIX #10460 compatibility with MariaDB 10.4 2019-09-08 05:15:26 +02:00
Alexandre SPANGARO
d9fa32b555 Traduction 2019-09-08 05:00:24 +02:00
Alexandre SPANGARO
3a2b3d311a Traduction 2019-09-08 04:57:09 +02:00
Alexandre SPANGARO
3a8d8ee902 FIX #11401 Adherent unknown language key 2019-09-08 03:56:01 +02:00
Laurent Destailleur
d6f105c783 Work on MRP module 2019-09-07 15:44:48 +02:00
Frédéric FRANCE
4054ebaf27
wip 2019-09-07 15:12:07 +02:00
Laurent Destailleur
452c248a0d Show list of menus and permission on the modulebuilder. 2019-09-07 14:49:48 +02:00
Frédéric FRANCE
bd4c9a64a8
wip 2019-09-07 14:48:25 +02:00
Laurent Destailleur
44cb9738d6 Fix trans 2019-09-07 14:35:47 +02:00
Frédéric FRANCE
61d432865b
wip 2019-09-07 14:33:36 +02:00
Frédéric FRANCE
c6a02312a9
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-07 14:19:07 +02:00
Laurent Destailleur
5d6ccfdf00 Fix phpcs 2019-09-07 13:12:39 +02:00
Laurent Destailleur
f483c673aa
Merge pull request #9912 from atm-greg/Edit_priceHT_for_predefined_products
NEW add ability to edit price ht before adding a line
2019-09-07 11:30:13 +02:00
Laurent Destailleur
881b69d117
Merge branch 'develop' into Edit_priceHT_for_predefined_products 2019-09-07 11:29:49 +02:00
Laurent Destailleur
a5d04e8fd5
Update product.php 2019-09-07 11:26:21 +02:00
Laurent Destailleur
c7a90ad528
Update product.php 2019-09-07 11:25:58 +02:00
Laurent Destailleur
eb7f964268
Update objectline_create.tpl.php 2019-09-07 11:25:11 +02:00
Laurent Destailleur
30d2f84eb7 Remove a label that is no more used 2019-09-07 10:58:20 +02:00
Laurent Destailleur
a481fac289
Merge pull request #11793 from altatof/supplierorderstatus
Differentiate supplier orders status
2019-09-07 10:54:03 +02:00
Laurent Destailleur
7386ba61d7
Merge pull request #11673 from ptibogxiv/patch-221
NEW display supplier in objectline if defined
2019-09-07 10:50:32 +02:00
Laurent Destailleur
df90016ad7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-07 10:43:47 +02:00
Laurent Destailleur
397e656161 Update doc 2019-09-07 10:43:35 +02:00
Laurent Destailleur
131c3d8f7a
Merge pull request #9612 from atm-greg/Hook_on_commonGenerateDocument
NEW add hook on commongeneratedocument
2019-09-07 10:27:06 +02:00
Laurent Destailleur
7fe2483a82
Merge branch 'develop' into Hook_on_commonGenerateDocument 2019-09-07 10:26:23 +02:00
Laurent Destailleur
c9a62b09c1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-07 09:50:08 +02:00
Laurent Destailleur
bdbae9b3bc Fix phpcs 2019-09-06 23:51:33 +02:00
Laurent Destailleur
4e5b4964dc
Merge pull request #11827 from aspangaro/10.0_boxes_nowrap
FIX Nowrap missing on amount in boxes
2019-09-06 23:37:23 +02:00
Laurent Destailleur
72dcb98c5c
Merge pull request #11819 from aspangaro/10.0_theme
FIX Missing ticket icon on md theme
2019-09-06 23:35:20 +02:00
Laurent Destailleur
dd39f5a285
Merge pull request #11823 from hregis/develop_pdf
FIX change "rowid" type in llx_accounting_account (bigint instead int)
2019-09-06 23:34:39 +02:00
Laurent Destailleur
ca71f02d41
Merge branch 'develop' into develop_pdf 2019-09-06 23:30:12 +02:00
Laurent Destailleur
b4aa030dd3
Merge pull request #11824 from ptibogxiv/patch-253
FIX: dol_thirdparty_id for stripe PI
2019-09-06 23:29:34 +02:00
Laurent Destailleur
a168c989f8
Update stripe.class.php 2019-09-06 23:29:27 +02:00
Laurent Destailleur
b2fe04e2f7
Merge pull request #11832 from hregis/10.0_mc
FIX avoid Warning: A non-numeric value encountered
2019-09-06 23:25:56 +02:00
Laurent Destailleur
f12a012932
Update card.php 2019-09-06 23:25:40 +02:00
Laurent Destailleur
f338a5f9ad Debug module datapolicy 2019-09-06 19:56:00 +02:00
Laurent Destailleur
89e1cdff61 Debug module datapolicy 2019-09-06 19:41:15 +02:00
Laurent Destailleur
231725e351 Fix scrutinizer 2019-09-06 19:12:43 +02:00
Laurent Destailleur
018a43e1d3 Fix 2019-09-06 18:57:34 +02:00
Laurent Destailleur
a5f7211730 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/install/repair.php
2019-09-06 16:10:55 +02:00
Laurent Destailleur
74203a6896 Fix phpcs 2019-09-06 16:01:54 +02:00
Laurent Destailleur
348ab4765c Fix sql injection 2019-09-06 15:20:04 +02:00
Laurent Destailleur
cad9a59d2a Add option to be able to find behaviour before the fix of list of
invoice in direct debit order.
2019-09-06 14:45:55 +02:00
Laurent Destailleur
09d6826e62 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/supplier_order.php
	htdocs/langs/en_US/admin.lang
2019-09-06 14:27:01 +02:00