Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
66,401 Commits 36 Branches 189 Tags
e0c0f7fd9ba29a25c6e542f07ae6329cae23dd1c
Commit Graph

66401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre SPANGARO
e0c0f7fd9b Fix Accountancy 2018-04-17 20:04:55 +02:00
Laurent Destailleur
106fb87d0a NEW Can sort order of files in attach tab for leave and expensereport 2018-04-16 19:25:27 +02:00
Laurent Destailleur
faea6861c3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/invoicetemplate_list.php
	htdocs/langs/en_US/bills.lang
 2018-04-16 18:19:21 +02:00
Laurent Destailleur
f19abe38d7 FIX pdf thumb for expense report 2018-04-16 18:17:35 +02:00
Laurent Destailleur
27a8476117 FIX remove var_dump 2018-04-16 17:02:54 +02:00
Laurent Destailleur
622042e9b2 FIX Max nb of generation of recurring invoice should not show warning 2018-04-16 15:05:35 +02:00
Laurent Destailleur
50d86a7cfd Fix accounting area when advanced accounting module not enabled 2018-04-16 14:25:39 +02:00
Laurent Destailleur
f1ad3912e7 Fix multicompany compatibility for recurring invoice generation 2018-04-16 14:18:38 +02:00
Laurent Destailleur
14ed19265c FIX environment shown on cron card 2018-04-16 13:53:59 +02:00
Laurent Destailleur
0d0da234b1 Lowercase NULL, TRUE, FALSE according to PSR2 2018-04-16 13:51:16 +02:00
Laurent Destailleur
c702c88fde CSS 2018-04-16 13:11:48 +02:00
Laurent Destailleur
e7f6785a53 Add log 2018-04-16 12:23:24 +02:00
Laurent Destailleur
f05cc8b310 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-16 11:20:44 +02:00
Laurent Destailleur
0d26bdcdc5 FIX Button receive products not visible 2018-04-16 11:20:29 +02:00
Laurent Destailleur
d549090290 Fix translation of button action must be a verb 2018-04-16 11:12:56 +02:00
Laurent Destailleur
99633eb815 FIX button "Classify bill" on supplier order was not visible 2018-04-16 11:12:27 +02:00
Laurent Destailleur
8c307987d8 css 2018-04-16 00:26:13 +02:00
Laurent Destailleur
ecb50a8a6d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-15 22:02:05 +02:00
Laurent Destailleur
69c26e19a8 NEW Can edit the text color for title line of tables 2018-04-15 22:01:52 +02:00
Laurent Destailleur
56a634bec3 Look and feel v7 2018-04-15 20:17:04 +02:00
Laurent Destailleur
72de21537c Clean code 2018-04-15 20:09:09 +02:00
Laurent Destailleur
6450f95c90 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-15 19:13:38 +02:00
Laurent Destailleur
2959dc4a3a Fix regression 2018-04-15 18:20:04 +02:00
Laurent Destailleur
e2838aa074 NEW Show also size in bytes in tooltip if visible unit is not bytes 2018-04-15 17:58:13 +02:00
Laurent Destailleur
8fbde88872 Look and feel v8 2018-04-15 17:37:49 +02:00
Laurent Destailleur
9e50bbb9b1 standardize code 2018-04-15 16:35:18 +02:00
Laurent Destailleur
57c03553dd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-04-15 12:09:07 +02:00
Laurent Destailleur
9ae789b358 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-15 11:42:12 +02:00
Laurent Destailleur
13ba69e085 Merge pull request #8595 from hregis/develop_ldap 
Fix: broken $pdf object !
 2018-04-15 11:38:51 +02:00
Laurent Destailleur
da66e5c5a7 Update pdf.lib.php 2018-04-15 11:38:29 +02:00
Laurent Destailleur
64dafbc37f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-15 11:33:40 +02:00
Laurent Destailleur
37e4da30d0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-15 11:33:27 +02:00
Laurent Destailleur
e29476428c Merge pull request #8594 from hregis/6.0_multicompany 
FIX project category is type 6 not 5 !!
 2018-04-15 11:32:49 +02:00
Laurent Destailleur
daf63ca116 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-15 11:32:06 +02:00
Laurent Destailleur
5968ca8cf2 Merge pull request #8593 from frederic34/patch-2 
Translation
 2018-04-15 11:31:21 +02:00
Laurent Destailleur
e49e455c0c Merge pull request #8598 from aspangaro/8.0-a19 
Accountancy - list by account - Add some fix & functions
 2018-04-15 11:31:01 +02:00
Laurent Destailleur
90b5adaef1 Merge pull request #8600 from aspangaro/8.0-a20 
Fix export balance
 2018-04-15 11:28:22 +02:00
Laurent Destailleur
514b1116b7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-15 11:28:05 +02:00
Laurent Destailleur
f9382ce395 Upgrade octicons 2018-04-15 11:27:39 +02:00
Laurent Destailleur
dbfee8117d Merge pull request #8597 from atm-florian/dev_uniformcode 
fix syntax and uniformize code
 2018-04-15 11:26:18 +02:00
Laurent Destailleur
6b3c17680f Merge pull request #8596 from simnandez/5.0 
FIX: some localtaxes errors
 2018-04-15 11:25:27 +02:00
Laurent Destailleur
9a018cba1c Merge pull request #8599 from grandoc/new_branch_15_04_2018 
fix typo
 2018-04-15 11:22:56 +02:00
Alexandre SPANGARO
910d83d6e3 Fix export balance 2018-04-15 07:49:54 +02:00
Philippe GRAND
0a6bcb2a39 fix typo and translation 2018-04-15 07:37:23 +02:00
Philippe GRAND
7943a19402 fix typo 2018-04-15 07:07:04 +02:00
Alexandre SPANGARO
899ef6d2a6 Accountancy - list by account - Add some fix & functions 2018-04-15 06:55:18 +02:00
Laurent Destailleur
db385d64b6 Fix br 2018-04-14 23:24:01 +02:00
Laurent Destailleur
ffffd848a9 Look and feel v8 2018-04-14 22:34:46 +02:00
Laurent Destailleur
92d8867b6e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2018-04-14 22:24:47 +02:00
Laurent Destailleur
187cc35786 Look and feel v8 2018-04-14 22:23:56 +02:00