Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-21 17:01:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
81,180 Commits 36 Branches 190 Tags
0a125f73b5ae8ef858ec3a901b2f68045ddbb16c
Commit Graph

81180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
florian HENRY
f5a669e02b Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-09 10:16:09 +02:00
florian HENRY
bdb297a380 resolve conflict 2019-09-09 10:15:44 +02:00
VESSILLER
66611f4097 FIX rename "resource" (reserved) by "dolresource" 2019-09-09 09:29:43 +02:00
Laurent Destailleur
1d74387125 Removed deprecated property ->numero (We must use ->num_payment) 2019-09-09 08:47:23 +02:00
Laurent Destailleur
6d38d58000 Trans 2019-09-08 21:31:10 +02:00
Laurent Destailleur
feca9a7ee3 Fix phpcs 2019-09-08 21:28:17 +02:00
Laurent Destailleur
5cc0b24f6f Fix param 2019-09-08 21:24:01 +02:00
Laurent Destailleur
47f72fb74c Update data file 2019-09-08 21:21:58 +02:00
Laurent Destailleur
1d311b2969 Fix scrutinizer 2019-09-08 21:21:33 +02:00
ATM john
ecddeb2b8b Add progress to global task list 2019-09-08 21:19:15 +02:00
stickler-ci
2e63e7bc27 Fixing style errors. 2019-09-08 18:17:51 +00:00
ptibogxiv
e37875f70a Update card.php 2019-09-08 20:16:05 +02:00
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