Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
87,753 Commits 36 Branches 189 Tags
45f834cb15122c034e1666a03e920f159183d7dd
Commit Graph

10032 Commits

Author SHA1 Message Date
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
stickler-ci
4480d7dd88 Fixing style errors. 2019-11-04 14:09:43 +00:00
Philippe GRAND
2909f8141e fix translation 2019-11-04 15:08:43 +01:00
Laurent Destailleur
99a4781a42 Fix better support for multicurrency for template invoices 2019-11-03 18:58:26 +01:00
Laurent Destailleur
630a150b09 Fix multicurrency rate must be visible if currency differs only 2019-11-03 17:48:16 +01:00
Laurent Destailleur
6f82c212a0 Finished migration to the new architecture of extrafields 2019-11-02 17:38:19 +01:00
Laurent Destailleur
89f1904793 Finish removing of ->attribute_label 2019-11-02 17:26:26 +01:00
Laurent Destailleur
e087ac434d Merge pull request #12283 from frederic34/socid 
replace deprecated user->societe_id by user->socid
 2019-11-02 13:34:21 +01:00
Laurent Destailleur
6348227698 Merge pull request #12275 from frederic34/patch-8 
css
 2019-11-02 13:31:18 +01:00
Laurent Destailleur
d232b7a387 Merge pull request #12286 from grandoc/new_branch_01_11_2019 
add some comment
 2019-11-02 13:00:23 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Laurent Destailleur
25e64b0610 Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
c12e66e2a2 Merge branch 'develop' into new_branch_01_11_2019 2019-11-02 12:00:04 +01:00
Laurent Destailleur
68c971a2b5 All properties 'type_libelle' were renamed into 'type_label'. 2019-11-02 11:12:57 +01:00
Laurent Destailleur
82bda63920 Merge pull request #12296 from frederic34/patch-20 
Update index.php
 2019-11-02 10:09:55 +01:00
Frédéric FRANCE
77d4ca81dc Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Frédéric FRANCE
dbed10a701 Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
2d9135b6ad Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/card.php
	htdocs/holiday/list.php
 2019-11-01 21:06:06 +01:00
Frédéric FRANCE
8b98df296f Update info.php 2019-11-01 17:36:11 +01:00
Frédéric FRANCE
6dd8e7152c Update index.php 2019-11-01 17:31:34 +01:00
Frédéric FRANCE
38b86d4bde Update payments.php 2019-11-01 17:30:49 +01:00
Frédéric FRANCE
61873aa1a8 Update list.php 2019-11-01 17:29:21 +01:00
Frédéric FRANCE
5314ff70f5 Update index.php 
in class ref and rowid are the same, lib is deprecated and is label
 2019-11-01 17:26:53 +01:00
Laurent Destailleur
e3b5be7475 All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed 
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
 2019-11-01 12:52:03 +01:00
Philippe Grand
9fad5dc8fc Update chargesociales.class.php 2019-11-01 11:16:47 +01:00
Philippe Grand
f568241a81 Update cashcontrol.class.php 2019-11-01 11:16:20 +01:00
stickler-ci
0c6938aa2a Fixing style errors. 2019-11-01 09:44:29 +00:00
Philippe GRAND
4fe3e49502 add some comment 2019-11-01 10:42:14 +01:00
Laurent Destailleur
a0e377feb3 Look and feel v11 2019-10-31 22:11:26 +01:00
Laurent Destailleur
a1700e71be Fix phpcs 2019-10-31 21:18:38 +01:00
Frédéric FRANCE
e93aaa2a75 replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
607c38775d Use popup 2019-10-31 14:57:05 +01:00
Laurent Destailleur
360b3a9550 NEW Ask the new label and new dates in confirm popup when cloning tax 2019-10-31 14:06:26 +01:00
Frédéric FRANCE
f202424432 css 2019-10-30 18:52:54 +01:00
Laurent Destailleur
923ab59e4e Merge pull request #12219 from frederic34/patch-7 
css
 2019-10-30 03:13:14 +01:00
Laurent Destailleur
8849cd9897 Update index.php 2019-10-30 02:19:32 +01:00
Alexandre SPANGARO
db86dff7d1 Fix sign for VAT repaid in report 2019-10-29 17:10:10 +01:00
Frédéric FRANCE
a1f0245c79 clean indent in compta, contact directory 2019-10-26 18:13:20 +02:00
Frédéric FRANCE
79825e2193 start clean indent in compta directory 2019-10-26 14:42:25 +02:00
Frédéric FRANCE
99b338b468 Update index.php 2019-10-24 23:09:58 +02:00
Laurent Destailleur
b4eb14ee44 Use dolGetStatus 2019-10-24 16:43:23 +02:00
Laurent Destailleur
9a386da7f5 NEW Can crop/resize image attached on a bank record 2019-10-23 16:07:09 +02:00
Laurent Destailleur
31ad147e0e Look and feel v11 2019-10-23 15:17:01 +02:00
Laurent Destailleur
02f559db5f Use GETPOST 2019-10-23 15:07:21 +02:00
Laurent Destailleur
564f96c092 Fix scrutinizer warnings 2019-10-23 14:59:02 +02:00
Laurent Destailleur
b88968520b Move code of extrafields to the new architecture 2019-10-22 17:08:37 +02:00
Laurent Destailleur
9be9f912af Merge pull request #12192 from Ahuahuachi/develop 
Translate documentation and minor code improvement
 2019-10-22 12:32:40 +02:00
Alfredo Altamirano
f2e5a23547 Declaration of $soc should not be conditional 2019-10-20 13:47:39 -05:00
Frédéric FRANCE
86f22c4563 do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00