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

66340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
3cfb6aaa67 Fix missing trigger CONTRACT_MODIFY 2018-02-04 12:59:16 +01:00
fappels
bb42589d6b Fix paging when filtering 
If total resultset is smaller then paging size (filtering), goto and
load page 0.
If total resultset is smaller the limit, no need to do paging.
 2018-02-04 12:59:02 +01:00
Laurent Destailleur
42f8da7496 NEW Add trigger CONTRACT_MODIFY 2018-02-04 12:56:17 +01:00
Laurent Destailleur
956df63c87 Fix extrafields updated twice 2018-02-04 12:55:29 +01:00
Laurent Destailleur
e5cb2be618
Merge pull request #8129 from hregis/6.0_bug 
Fix: remove lines with special code when convert to reduc
 2018-02-04 12:18:20 +01:00
Laurent Destailleur
c4277c1e54
Merge pull request #8128 from hregis/5.0_bug 
Fix: remove lines with special code when convert to reduc
 2018-02-04 12:17:54 +01:00
Laurent Destailleur
4fdde55c59 Keep empty graph if graph is called with empty data 2018-02-04 12:14:39 +01:00
Laurent Destailleur
0e3d5ea9e5 Fix missing translation 2018-02-04 11:44:39 +01:00
Laurent Destailleur
f3700b66c6 Fix size of columns when using PRODUCT_USE_UNIT 2018-02-04 11:17:45 +01:00
Laurent Destailleur
fd8f89c708 FIX a discount is a percent, not an amount, so we use vatrate not price 2018-02-04 11:13:47 +01:00
Laurent Destailleur
d24d401f3a Fix translation 2018-02-04 10:55:09 +01:00
Laurent Destailleur
85031f61f3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-04 10:51:20 +01:00
Laurent Destailleur
ea15c1bfed Fix CONTRACT_SYNC_PLANNED_DATE_OF_SERVICES 2018-02-04 10:50:58 +01:00
Regis Houssin
8ee1186492 Fix: wrong test 2018-02-04 09:05:35 +01:00
Regis Houssin
d5b7184c8d Fix: wrong test 2018-02-04 09:04:15 +01:00
Regis Houssin
a161ca37ff Fix: use product_type instead special_code 2018-02-04 08:58:31 +01:00
Regis Houssin
c1e6d88442 Fix: use product_type instead special_code 2018-02-04 08:55:51 +01:00
Laurent Destailleur
c6fba7273d Api interventions 2018-02-03 20:58:26 +01:00
Laurent Destailleur
3fd0105512
Merge pull request #8104 from kadogo/add-api-for-fichinter 
NEW: Add an API for fichinter
 2018-02-03 20:00:14 +01:00
Laurent Destailleur
408fc69fac
Update index.php 2018-02-03 19:59:21 +01:00
Laurent Destailleur
48a31b2398
Update explorer.php 2018-02-03 19:58:30 +01:00
Laurent Destailleur
936a2ca966
Merge branch '7.0' into add-api-for-fichinter 2018-02-03 19:57:04 +01:00
Laurent Destailleur
30c68aecf2 Code comment 2018-02-03 19:52:09 +01:00
Laurent Destailleur
5ab5c12a7b Code comments 2018-02-03 19:42:00 +01:00
Laurent Destailleur
f57ea2682a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/notify.class.php
	htdocs/societe/class/societe.class.php
 2018-02-03 19:33:24 +01:00
Laurent Destailleur
7c6c893657
Merge pull request #7996 from atm-maxime/new_force_mailto 
NEW Option to force all emails recipient
 2018-02-03 19:15:11 +01:00
Laurent Destailleur
6de2a08d70 Fix scrutinizer bugs 2018-02-03 19:10:52 +01:00
Laurent Destailleur
5c6dd0b061 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-03 19:00:04 +01:00
Laurent Destailleur
a91172b7bc Add comment into csv export 2018-02-03 18:58:02 +01:00
Laurent Destailleur
9d0314dbae NEW Add option CONTRACT_SYNC_PLANNED_DATE_OF_SERVICES 2018-02-03 18:50:20 +01:00
Laurent Destailleur
5dde72e3dd
Update actions_sendmails.inc.php 2018-02-03 17:45:05 +01:00
Laurent Destailleur
77d4107085
Update actions_sendmails.inc.php 2018-02-03 17:44:37 +01:00
Laurent Destailleur
0280d0f5fe
Merge branch 'develop' into bug-4875 2018-02-03 17:42:17 +01:00
Laurent Destailleur
f3f39fb1ee Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-03 17:37:51 +01:00
Laurent Destailleur
833c7685e1 Hook 'maildao' was renamed into 'mail' into the method sendfile that 
send emails, and method was renamed from 'doaction' into 'sendMail'.
To process task #4875 #7969 in several steps.
 2018-02-03 17:36:33 +01:00
Laurent Destailleur
e982e1d28c
Merge pull request #8062 from atm-maxime/new_disable_freelines 
NEW hidden option MAIN_DISABLE_FREE_LINES
 2018-02-03 17:02:05 +01:00
Laurent Destailleur
a308e45c6b
Update objectline_create.tpl.php 2018-02-03 17:00:47 +01:00
Laurent Destailleur
b3df7670e9
Merge pull request #7999 from frederic34/propalweight 
NEW display weight volume in propal
 2018-02-03 16:58:58 +01:00
Laurent Destailleur
2114e6ba4e
Merge pull request #8101 from simnandez/6.0 
FIX: #7974 Contract - Invalid reference on the document
 2018-02-03 16:57:22 +01:00
Laurent Destailleur
c9e7e6d925
Merge pull request #8130 from hregis/6.0_bug2 
Fix: compatibility with multicompany sharing
 2018-02-03 16:45:16 +01:00
Laurent Destailleur
fa3f06aaaa
Merge pull request #8123 from atm-florian/7.0 
fix warning class declaration
 2018-02-03 16:33:39 +01:00
Laurent Destailleur
756f8a1b9f
Update modules_expensereport.php 2018-02-03 16:33:27 +01:00
Laurent Destailleur
97a29e87ea Fix pdf template baleine (pb with page breaks and long task desc) 2018-02-03 16:31:36 +01:00
Juanjo Menent
c434136ba5 Merge remote-tracking branch 'upstream/6.0' into 6.0 2018-02-02 23:44:54 +01:00
Juanjo Menent
464ee6f9d6 Revert 2018-02-02 17:46:25 +01:00
Laurent Destailleur
fe1f276d85 FIX labels into ledger are same that into screen 
FIX pagination
FIX init of fiscal year
Fix tr balance
 2018-02-02 17:24:40 +01:00
Laurent Destailleur
12aec8f806 Prepare database for invoicing of projects 2018-02-02 15:19:04 +01:00
Laurent Destailleur
a41847d084 Fix: date of modificaiton in ledger not visible. 
Fix: show hours in date of creation in ledger.
Fix: label in export.
Fix: label in export of draft journal is same than on screen.
Fix: missing line desc in csv export of draft bank journal.
 2018-02-02 14:27:07 +01:00
Regis Houssin
13106d34a6 Fix: compatibility with multicompany sharing 2018-02-02 12:36:47 +01:00
Laurent Destailleur
2e705b5a88 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-02 10:41:20 +01:00