lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
66,310 Commits 43 Branches 150 Tags 886 MiB
93ea46c58c
Commit Graph

66310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
93ea46c58c
Merge branch 'develop' into develop-ecmfiles 2018-04-13 23:08:26 +02:00
Laurent Destailleur
ab720abca2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-13 22:57:57 +02:00
Laurent Destailleur
a933e458e7 Repair type of product in invoice table from type of product 2018-04-13 22:57:43 +02:00
Laurent Destailleur
12b5070d23
Merge pull request #8586 from hregis/develop_bug5 
Fix: avoid Warning: Creating default object from empty value
 2018-04-13 22:23:20 +02:00
Laurent Destailleur
3b202b2255
Merge branch 'develop' into develop_bug5 2018-04-13 22:23:14 +02:00
Laurent Destailleur
374a0723bf Fix VAT report by rate 2018-04-13 22:20:14 +02:00
Laurent Destailleur
32ff8ae132 Fix link 2018-04-13 18:02:25 +02:00
Laurent Destailleur
6f91b8019f Remove warnings 2018-04-13 17:54:27 +02:00
Laurent Destailleur
300d6962d9 Fix step5 upgrade process 2018-04-13 17:05:35 +02:00
fappels
e054d1ae8d Try to fix travis 2018-04-13 16:49:03 +02:00
Laurent Destailleur
4251748aca Clean code 2018-04-13 16:18:33 +02:00
Laurent Destailleur
7811796491 Fix test 2018-04-13 15:43:26 +02:00
fappels
9ba697ea98 Enable triggers 
Add missing fields $src_object_type $src_object_id.
 2018-04-13 15:12:36 +02:00
Laurent Destailleur
77a853e49d Fix remove warning 2018-04-13 14:53:40 +02:00
Laurent Destailleur
86112f0096 Syntax error 2018-04-13 14:15:33 +02:00
Laurent Destailleur
9f5eed0c9a Code comment 2018-04-13 14:12:31 +02:00
Laurent Destailleur
d4cd5a0d95 Fix syntax error 2018-04-13 13:37:43 +02:00
Laurent Destailleur
be965bdbab Clean code 2018-04-13 13:28:48 +02:00
Laurent Destailleur
b68cded9c4 Clean code 2018-04-13 13:11:07 +02:00
Laurent Destailleur
f3e10c5a00 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-13 12:52:34 +02:00
Laurent Destailleur
fbae4429b7 Clean code for better extrafields management 2018-04-13 12:52:23 +02:00
Regis Houssin
e6ff852226 Fix: avoid Warning: Creating default object from empty value 2018-04-13 11:20:21 +02:00
Laurent Destailleur
1521b0595b Clean code 2018-04-13 11:03:03 +02:00
Laurent Destailleur
78fcbe9633 FIX the extrafields separator was not translated 2018-04-13 10:48:29 +02:00
Laurent Destailleur
85161f91ac
Merge pull request #8581 from defrance/patch-110 
printTopRightMenu trigger : numeric result never empty
 2018-04-13 10:37:51 +02:00
Laurent Destailleur
b1043e2a57
Update main.inc.php 2018-04-13 10:37:40 +02:00
Laurent Destailleur
768b9d3d1e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-13 10:01:45 +02:00
Laurent Destailleur
04aafbc493 Fix css to restore focus undertext on select2 combo lists 2018-04-13 10:01:07 +02:00
BENKE Charlene
a7decb2173
printTopRightMenu trigger numeric never empty 
maybe find something better
 2018-04-13 02:42:19 +02:00
Laurent Destailleur
39ebaf40ac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-13 00:58:37 +02:00
Laurent Destailleur
0bbe7043ef Fyx syntax error 2018-04-13 00:58:23 +02:00
Laurent Destailleur
6e288fca75
Merge pull request #8575 from all3kcis/develop-patch-16 
NEW Add files management on products lot
 2018-04-13 00:57:13 +02:00
Laurent Destailleur
891925874f FIX #8574 2018-04-13 00:54:08 +02:00
Laurent Destailleur
3078b890d4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/stripe/admin/stripe.php
 2018-04-13 00:45:39 +02:00
Laurent Destailleur
ecd18da137 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-13 00:43:37 +02:00
Laurent Destailleur
f7bb781b42 FIX #8571 2018-04-13 00:43:15 +02:00
Laurent Destailleur
2fadfe4b6e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-13 00:42:20 +02:00
Laurent Destailleur
519ee64c1f Translation 2018-04-13 00:42:08 +02:00
Laurent Destailleur
2bbde44f63 FIX #8580 2018-04-12 23:54:53 +02:00
Laurent Destailleur
d530337bdc
Merge pull request #8579 from hregis/develop_ldap 
Fix: wrong permissions
 2018-04-12 23:51:37 +02:00
Laurent Destailleur
7bf9801b80
Merge pull request #8577 from atm-florian/6.0 
fix error on first install pgsql
 2018-04-12 23:47:10 +02:00
Laurent Destailleur
341d1efb11 Fix clear filter must not lose type 2018-04-12 23:42:06 +02:00
Laurent Destailleur
ce402abda2 Debut ticket module 2018-04-12 23:33:38 +02:00
Laurent Destailleur
ace55ba569 Debug usage of extrafields for ticket module 2018-04-12 23:17:46 +02:00
Laurent Destailleur
3cecfd02c7 NEW Mutualize code for action="update_extras" 
NEW Can use setValueFrom without user modification field
FIX Exclude separators from mandatory extrafields test
More code to use the new framework array for extrafields
Can use text condition in extrafield visibility
 2018-04-12 23:16:23 +02:00
Laurent Destailleur
1c9661d9d6 FIX Update incoterm on supplier invoice 2018-04-12 21:39:12 +02:00
Laurent Destailleur
664f57a5f0 Clean code 2018-04-12 19:13:06 +02:00
Regis Houssin
ee61324caf Fix: show \r\n if description contain <br> 2018-04-12 18:57:51 +02:00
Laurent Destailleur
4b38cf5329 Fix request at wrong place 2018-04-12 18:30:07 +02:00
Regis Houssin
bd95e5265e Fix: wrong permissions 2018-04-12 18:05:12 +02:00