Commit Graph

61371 Commits

Author SHA1 Message Date
Rui Strecht
bafd64e5fa Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-12 16:10:20 +01:00
Laurent Destailleur
71ce82b6b9 NEW Better autoselect customer or supplier fields to save clicks 2017-09-12 16:51:10 +02:00
Laurent Destailleur
c5bf5c7e67 Minor fixes 2017-09-12 15:26:44 +02:00
Laurent Destailleur
dc61c53d39 Balance automatically set on good year according to fiscal start month 2017-09-12 15:22:23 +02:00
Laurent Destailleur
85cad6d537 Add TODO 2017-09-12 15:10:51 +02:00
Laurent Destailleur
c9c91193de Code comment 2017-09-12 14:56:56 +02:00
Laurent Destailleur
bc15a0f8e0 Fix search criteria list 2017-09-12 14:50:12 +02:00
Laurent Destailleur
3d4134df7a Translation 2017-09-12 14:39:20 +02:00
Laurent Destailleur
c5961d8386 Pass user to the delete function 2017-09-12 14:34:33 +02:00
Laurent Destailleur
531ebc4c48 Fix merge 2017-09-12 13:53:55 +02:00
Laurent Destailleur
f411476718 Fix default value of filter 2017-09-12 13:52:19 +02:00
Laurent Destailleur
5dcbebbd46 NEW Add filters on month/year on the accountancy binding tools 2017-09-12 13:48:45 +02:00
Laurent Destailleur
a4665e17d4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/societe/class/societe.class.php
	htdocs/societe/list.php
2017-09-12 13:26:25 +02:00
Laurent Destailleur
16092bc9f0 Clean code 2017-09-12 13:13:57 +02:00
Laurent Destailleur
3001ee5fe7 Fix title of reports 2017-09-12 13:05:34 +02:00
Laurent Destailleur
d0a0bf57b6 NEW The "Show detail by account" accepts 3 values: yes, no, if non zero 2017-09-12 12:52:48 +02:00
Laurent Destailleur
627dd15b44 Suggested link for online payment use the generic link 2017-09-12 12:18:26 +02:00
Laurent Destailleur
cda8c6e41a Fix ref must be 50 2017-09-12 11:51:51 +02:00
Laurent Destailleur
fcf82f1163 Enhancement into setup of member module 2017-09-12 11:17:23 +02:00
Rui Strecht
5213ce60c5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-11 15:56:48 +01:00
Laurent Destailleur
07b040a8eb Save space 2017-09-11 16:31:44 +02:00
Laurent Destailleur
8cb9e8c2da Add $object into hooks 2017-09-11 16:26:01 +02:00
Laurent Destailleur
f0f6df4c90 Fix tables declaration 2017-09-11 15:23:49 +02:00
Laurent Destailleur
1f56800a50 Merge pull request #7341 from atm-arnaud/NEW_task_discussion
New task discussion
2017-09-11 15:20:13 +02:00
Laurent Destailleur
78ffbd1095 Merge pull request #7369 from hregis/develop_bug
Fix: remove table prefix
2017-09-11 15:06:01 +02:00
Laurent Destailleur
44405e5415 Fix #7335 #7365 Better fix 2017-09-11 15:04:29 +02:00
Laurent Destailleur
403f11759c Merge pull request #7363 from Gitdyr/develop
Danish accounts for accounting
2017-09-11 14:50:58 +02:00
Laurent Destailleur
e9bc5b719d Complete #7361 2017-09-11 14:50:00 +02:00
reeperbahnause
2fdad0f11d fix #7361 missing generateDocument function
fix #7361  
Function generateDocument was missing for Class Fichinter
2017-09-11 14:46:58 +02:00
Laurent Destailleur
80c00a0ba4 Merge pull request #7362 from reeperbahnause/patch-2
fix #7361 missing generateDocument function
2017-09-11 14:46:03 +02:00
Laurent Destailleur
6da5a6b82f FIX #7359
Conflicts:
	htdocs/fichinter/class/fichinter.class.php
2017-09-11 14:43:40 +02:00
Laurent Destailleur
22b8818100 FIX #7359 2017-09-11 14:41:46 +02:00
Laurent Destailleur
dcc9cb4a16 Some fixes in various payment 2017-09-11 14:29:27 +02:00
Laurent Destailleur
029f1c411f Merge pull request #7357 from hregis/6.0_medias
Fix: some problems with medias in multicompany
2017-09-11 14:13:51 +02:00
Laurent Destailleur
206e44431d Merge pull request #7356 from hregis/6.0_upgrade
Fix: missing salaries upgrade reload module
2017-09-11 14:09:39 +02:00
Laurent Destailleur
31b5ca17f1 Merge pull request #7353 from hregis/6.0_htmlentities
Fix: avoid htmlentities
2017-09-11 14:08:37 +02:00
Laurent Destailleur
5a68d69067 Merge pull request #7350 from hregis/6.0_bug2
Fix: missing parameters for filter and sort (contact list)
2017-09-11 14:07:56 +02:00
Laurent Destailleur
19e780c53f Merge pull request #7346 from hregis/6.0_bug3
Fix: avoid warning
2017-09-11 14:07:38 +02:00
Laurent Destailleur
646e8713f2 Remove duplicated logs 2017-09-11 13:41:40 +02:00
Laurent Destailleur
b87ce172c3 FIX hidden option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN 2017-09-11 13:40:34 +02:00
Laurent Destailleur
59ab52c718 FIX hidden option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN 2017-09-11 13:39:03 +02:00
Regis Houssin
092b87bbda Fix: add llx_actioncomm in $childtablesoncascade 2017-09-11 13:36:03 +02:00
Rui Strecht
bddf292881 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-11 11:52:47 +01:00
Laurent Destailleur
7d42a58230 Fix no more fk_soc in this table 2017-09-11 12:46:01 +02:00
Regis Houssin
f8938f308d Fix: remove table prefix 2017-09-11 08:17:25 +02:00
Laurent Destailleur
34221fc163 CSS of payment page 2017-09-11 03:38:39 +02:00
Laurent Destailleur
61a0f04bbe FIX dateSelector was not taken into account 2017-09-11 03:30:45 +02:00
Laurent Destailleur
214bad26db Try a fix for dol_time_plus_duree when date is 2017-09-01 00:00 and
timezone > 0
2017-09-11 03:30:10 +02:00
Laurent Destailleur
e9e6a8e5ad Fix center of button 2017-09-11 03:29:36 +02:00
Laurent Destailleur
974f99ddb2 Increase length of title field 2017-09-11 02:54:21 +02:00