Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

18964 Commits

Author SHA1 Message Date
Alexandre SPANGARO
848acb6096 Update index 2019-10-02 08:49:33 +02:00
Alexandre SPANGARO
a6e429ff32 Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal 2019-10-02 08:49:00 +02:00
Frédéric FRANCE
802236f583 db escape 2019-10-02 08:31:46 +02:00
Alfredo Altamirano
9d75d7ac15 Translate french documentation 2019-10-02 00:55:46 -05:00
Laurent Destailleur
ba7a288abb Fix colspan and columns of contact of thirdparties 2019-10-01 23:28:13 +02:00
Frédéric FRANCE
aca9d92db8 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 22:03:33 +02:00
Frédéric FRANCE
26c34198bf show contact 2019-10-01 21:38:16 +02:00
Laurent De Coninck
3a25beabe6 add the country in the address of the PDF's footer 2019-10-01 21:03:58 +02:00
ATM john
4d5ffbb5c4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_unlock_title_button_feature 2019-10-01 20:45:04 +02:00
florian HENRY
d48f0fa791 resolve conflixt 2019-10-01 18:07:59 +02:00
Laurent Destailleur
68055e579f Check array is array 2019-10-01 16:26:55 +02:00
Laurent Destailleur
8ad81a092a Clean code 2019-10-01 16:19:54 +02:00
Laurent Destailleur
1ff8b879a8 Fix phpcs 2019-10-01 16:10:35 +02:00
Laurent Destailleur
29a2601b9d Merge pull request #11567 from inoveaconseil/ContextDashboard 
WIP: Context dashboard
 2019-10-01 15:21:35 +02:00
Laurent Destailleur
b79831ec39 Merge pull request #11952 from aspangaro/11.0_https 
Move Gnu.org to https
 2019-10-01 14:48:21 +02:00
Frédéric FRANCE
52b0a0d609 The variable $out seems to be never defined. 2019-10-01 13:45:18 +02:00
Laurent Destailleur
f91242c66c Fix css 2019-10-01 13:37:08 +02:00
Frédéric FRANCE
3b9bf2b06a Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 12:25:34 +02:00
Laurent Destailleur
fa921739ec Remove duplicate code 2019-10-01 12:03:17 +02:00
Laurent Destailleur
11e01f5c86 Use correct style for table header 2019-10-01 12:02:28 +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
15e646cc62 Fix bad name of trigger 2019-10-01 11:34:35 +02:00
Laurent Destailleur
c7da05e4a1 Fix bad name of trigger 2019-10-01 11:28:10 +02:00
Laurent Destailleur
6ebd060315 Use php var with same name than html var 2019-10-01 11:23:38 +02:00
Laurent Destailleur
0828000626 Merge pull request #12005 from laudeco/feature/filter_contacts 
working solution about filtering the contacs of one company
 2019-10-01 11:19:29 +02:00
Laurent Destailleur
0f4f5d47f2 Update company.lib.php 2019-10-01 11:18:53 +02:00
Laurent Destailleur
955d9daf38 Update company.lib.php 2019-10-01 11:18:14 +02:00
Laurent Destailleur
76bd09cfb5 Merge pull request #12002 from frederic34/patch-18 
Update box_supplier_orders.php to show email
 2019-10-01 11:16:40 +02:00
Laurent Destailleur
f151dc1951 Merge pull request #12000 from frederic34/zapier2 
zapier trigger
 2019-10-01 11:16:27 +02:00
Laurent Destailleur
2d8e3aad5b Merge pull request #12001 from frederic34/patch-17 
Update box_prospect.php to show email
 2019-10-01 11:13:01 +02:00
stickler-ci
5e075d5d30 Fixing style errors. 2019-10-01 06:39:26 +00:00
Frédéric FRANCE
c57c8eee88 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 07:41:10 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
f3f2ab8aad Update box_commandes.php 2019-09-30 22:45:28 +02:00
Frédéric FRANCE
466e48761c Update box_supplier_orders.php 2019-09-30 22:43:13 +02:00
Frédéric FRANCE
d0e9e9568a Update box_prospect.php 2019-09-30 22:40:07 +02:00
Frédéric FRANCE
b74a93e194 zapier trigger 2019-09-30 22:03:42 +02:00
Alexandre SPANGARO
8dea427f58 Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal 2019-09-30 21:23:27 +02:00
ATM john
b01bd979b5 Unlock title button feature 2019-09-30 21:10:16 +02:00
Laurent Destailleur
0846a081cb Merge branch 'develop' into new_branch_29_06_2019 2019-09-30 21:06:51 +02:00
Frédéric FRANCE
f32f528bc2 fix merge 2019-09-30 19:36:57 +02:00
Frédéric FRANCE
b87610adcc Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-30 19:34:35 +02:00
Laurent Destailleur
33908afb66 Update zapier logo 2019-09-30 19:30:31 +02:00
Frédéric FRANCE
fec67aade4 Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 18:44:34 +02:00
Frédéric FRANCE
a5fce6cca8 Update CMailFile.class.php 2019-09-30 18:25:54 +02:00
Laurent Destailleur
ecc2e8df67 Fix restore lost images 2019-09-30 17:58:31 +02:00
Laurent Destailleur
dc7ad61940 Add class reposition on button that switch the view mode 2019-09-30 17:46:53 +02:00