lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,153 Commits 43 Branches 150 Tags 886 MiB
ba5d6318ef
Commit Graph

48153 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ba5d6318ef Debug the integrity check feature. 2015-06-20 14:24:22 +02:00
Laurent Destailleur
a7ce414d23 Fix translation 2015-06-20 14:15:32 +02:00
Laurent Destailleur
2895241420 Update theme with 3.8 2015-06-19 17:03:35 +02:00
Laurent Destailleur
bbce287892 Fix: Pdf merge tool must see only pdf files 2015-06-19 16:05:04 +02:00
Laurent Destailleur
2785bf7520 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-19 12:13:39 +02:00
Laurent Destailleur
b3c1ebf30a Debug price per customer 2015-06-19 12:13:05 +02:00
Laurent Destailleur
694481ae5e Merge pull request #3071 from aspangaro/develop-patch35 
Review accountancy
 2015-06-19 11:29:01 +02:00
Laurent Destailleur
5376c771d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-19 11:27:59 +02:00
Laurent Destailleur
ad395ef176 Merge branch 'aspangaro-develop-patch34' into develop 2015-06-19 11:27:29 +02:00
Laurent Destailleur
01fbee0e06 Merge branch 'develop-patch34' of https://github.com/aspangaro/dolibarr 
into aspangaro-develop-patch34

Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2015-06-19 11:27:15 +02:00
Laurent Destailleur
eac822d821 Merge pull request #3069 from aspangaro/develop-patch33 
Fix: Accountancy - SQL error & typo
 2015-06-19 11:23:43 +02:00
Laurent Destailleur
44d4d23c00 Fix phpcs 2015-06-19 11:21:36 +02:00
Laurent Destailleur
bfc8ccd761 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-19 11:19:23 +02:00
Laurent Destailleur
20da120a49 Merge tab to upload photo and other files to same tab. This reduce 
duplicate code and avoid users to be lost.
 2015-06-19 11:19:13 +02:00
Laurent Destailleur
0d7fea70a0 Merge pull request #3068 from atm-alexis/develop 
FIX can receive new batch product on supplier order
 2015-06-19 11:17:59 +02:00
Laurent Destailleur
b39d100e53 Merge pull request #3067 from All-3kcis/patch-1 
FIX complete function ordersupplier_prepare_head() so a module can remove tabs
 2015-06-19 11:16:15 +02:00
Laurent Destailleur
5d585393ef Merge pull request #3065 from aspangaro/develop-patch32 
New: Add payment into expense report card - Link to the bank module
 2015-06-19 11:15:14 +02:00
Laurent Destailleur
d99fd37f3d Merge pull request #3061 from marcosgdf/bug-timezone-2 
Corrected Timezone detection by using jstz external library
 2015-06-19 11:13:50 +02:00
Laurent Destailleur
638f264d88 Merge pull request #3064 from znetstar/develop 
Adds a Dockerfile
 2015-06-19 11:13:25 +02:00
aspangaro
ceaa71649c Review customer list ventilation page 2015-06-19 06:56:21 +02:00
aspangaro
14ad53848d Remove $linkback, lang & html 2015-06-19 06:32:51 +02:00
aspangaro
0c01295016 Fix travis 2015-06-19 06:19:10 +02:00
aspangaro
f60ca03140 Fix travis 2015-06-19 06:11:32 +02:00
aspangaro
22d81dec60 Merge remote-tracking branch 'Upstream/develop' into develop-32 2015-06-19 06:10:18 +02:00
aspangaro
fb57941b21 typo 2015-06-19 06:06:46 +02:00
aspangaro
4bda3a3f21 Merge remote-tracking branch 'Upstream/develop' into develop-33 2015-06-19 06:04:56 +02:00
aspangaro
d959c552f2 Fix: Accountancy - SQL error 2015-06-19 06:01:42 +02:00
Laurent Destailleur
b5cc7ae1c8 Work on merge tab photos and attached files 2015-06-19 00:52:58 +02:00
Laurent Destailleur
d8f86708b1 Minor look fix 2015-06-19 00:36:03 +02:00
Laurent Destailleur
bbc70004d9 Disable option that i can't understand. 2015-06-19 00:18:41 +02:00
Alexis Algoud
21f0fc8229 FIX can receive new batch product on supplier order 2015-06-18 19:49:19 +02:00
Laurent Destailleur
425d9bff48 Tooltip to make understanding better. 2015-06-18 19:33:29 +02:00
All-3kcis
c96c528d3e Correction complete_head 
Ajout de la fonction complete_head_from_modules() pour supprimer les onglets si besoin.
 2015-06-18 15:16:28 +02:00
Laurent Destailleur
1ee933c4a1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-18 14:48:00 +02:00
Laurent Destailleur
7507a71121 Lenght of fields 2015-06-18 14:47:33 +02:00
Laurent Destailleur
e20a63c9f0 NEW Can use a "|" to make a OR search on several different criterias 
into text filters of tables.
 2015-06-18 14:38:12 +02:00
Laurent Destailleur
29422a9ff9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-18 14:25:31 +02:00
Laurent Destailleur
a2e9ebe2d1 Fix hover is ok on boxes array too. 2015-06-18 14:25:13 +02:00
aspangaro
7539ad88fa Debug 2015-06-18 06:30:48 +02:00
aspangaro
9cf06ec21c Add function set_paid 2015-06-18 06:12:05 +02:00
zachary
0ef8ea269b Adds php-gd and mysqli to dockerfile 2015-06-17 20:20:58 -04:00
zachary
f8cf0fa679 Adds dockerfile 2015-06-17 19:58:34 -04:00
aspangaro
50aa36502c Merge remote-tracking branch 'Upstream/develop' into develop-32 
Conflicts:
	htdocs/expensereport/card.php
 2015-06-17 07:21:43 +02:00
aspangaro
8d0e7261f5 Debug 2015-06-17 07:19:25 +02:00
Laurent Destailleur
b2c1365eca Merge pull request #3056 from defrance69/patch-65 
added ref supplier bill
 2015-06-17 00:18:38 +02:00
Laurent Destailleur
259fe11a1a Merge pull request #3060 from FHenry/develop 
default charset utf-8
 2015-06-17 00:17:38 +02:00
Marcos García de La Fuente
d8b7f3618c Updated changelog 2015-06-16 21:20:42 +02:00
Marcos García de La Fuente
1e05262884 Corrected Timezone detection by using jstz external library 2015-06-16 21:19:58 +02:00
Florian HENRY
6819e295f5 default charset utf-8 2015-06-16 20:22:01 +02:00
Laurent Destailleur
8df56511be NEW Enhance prototype, project list and proposal list with new hook to 
have an external module able to add more fields.
 2015-06-16 19:36:44 +02:00