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

68848 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
188e5d286d Fix statut 2018-03-29 13:28:29 +02:00
Laurent Destailleur
072b6c02c0 FIX Test on mandatory status when closing proposal failed 2018-03-29 13:25:03 +02:00
Laurent Destailleur
34ed6516e4 Fix field disappear 2018-03-29 12:52:35 +02:00
Laurent Destailleur
22d64a2768 Dolibarize module ticket 2018-03-29 12:50:03 +02:00
Laurent Destailleur
a7d472bf7b Dolibarize module ticket 2018-03-29 12:31:17 +02:00
Laurent Destailleur
ff505ba148 Work on a page dedicated for external frontend (mobile, ...) 2018-03-29 11:34:01 +02:00
Laurent Destailleur
b806b85761 Fix field filtert is set twice 2018-03-29 11:15:50 +02:00
Laurent Destailleur
202cf53bab Fix phpcs 2018-03-29 09:56:11 +02:00
Marc de Lima Lucio
9ba902504e FIX: langs 2018-03-29 09:38:16 +02:00
florian HENRY
cc7deb0add Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0 2018-03-29 09:36:05 +02:00
florian HENRY
78812ef826 better error management 2018-03-29 09:35:47 +02:00
Sean Wang
3dd9d47089 Fix wrong approve time in expense report 
The approve time showed was 8 hours more than the real time.
Checking database turned out that it had the wrong data(+8 hours).

After checking every timezone related settings were correct,
I found that it do twice idate() in setApproved().
Since we have idate() in $sql, we don't need the idate()
at the line 1249.
 2018-03-29 14:49:06 +08:00
Laurent Destailleur
39f25c9fc2 Fix phpcs 2018-03-29 08:28:36 +02:00
Laurent Destailleur
1c86eb1c44 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/localtax/index.php
	htdocs/compta/tva/quarter_report.php
	htdocs/core/lib/tax.lib.php
 2018-03-29 03:08:01 +02:00
Laurent Destailleur
4a289d10d4 Fix phpcs 2018-03-29 03:02:52 +02:00
Laurent Destailleur
125085acee Fix name of method to avoid ci errors 2018-03-29 03:01:05 +02:00
Marc de Lima Lucio
913135cb20 FIX: project mail: templates + hide actions when in presend 2018-03-28 17:10:12 +02:00
Marc de Lima Lucio
3aff363998 NEW: mail templates for projects 2018-03-28 17:08:26 +02:00
Marc de Lima Lucio
f5324bb15e FIX: only send mail from open project 2018-03-28 16:07:02 +02:00
atm-ph
a89983ef5c Fix error on creating company with external module in 'custom' folder with a file to generate accountancy code 2018-03-28 15:41:10 +02:00
Marc de Lima Lucio
f9bc5bf931 NEW: can send mail from project card 2018-03-28 15:22:47 +02:00
Marc de Lima Lucio
3646374976 NEW: default warehouse field for products + prefill warehouses when dispatching supplier orders 2018-03-28 11:54:21 +02:00
Regis Houssin
6e616e1198 Fix: better performance for openldap 2018-03-28 10:06:00 +02:00
Regis Houssin
63a5ff61ef Fix: missing encrypt for llx_const 2018-03-28 06:44:17 +02:00
Laurent Destailleur
0edba4b4a7 Manage field showoncombobox 2018-03-27 23:44:49 +02:00
Laurent Destailleur
7a45527983 Generate the foreign key into key.sql file 2018-03-27 23:26:20 +02:00
Laurent Destailleur
56c8ee8978 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-27 23:02:12 +02:00
Laurent Destailleur
6f6395e309 Code comment 2018-03-27 23:01:54 +02:00
Alexandre SPANGARO
c012c330de Merge remote-tracking branch 'uptream/develop' into 8.0-a11 2018-03-27 21:45:35 +02:00
Alexandre SPANGARO
6e27da605a Add label project in tooltip in customer/supplier list 2018-03-27 21:41:25 +02:00
Philippe GRAND
5b1efc2227 New [*use loadLangs for translation files*] and update code 2018-03-27 19:30:31 +02:00
Regis Houssin
dec0164ff9 Fix: differentiate "card", "contact" and "agenda 2018-03-27 19:12:01 +02:00
florian HENRY
7635f23d78 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0 2018-03-27 18:39:56 +02:00
florian HENRY
af7c1d8da1 fix error log 2018-03-27 18:39:18 +02:00
Laurent Destailleur
354ee7d09a Fix sortorder kept after editing a cron job and going back 2018-03-27 18:24:07 +02:00
Regis Houssin
7d7a006583 Fix: best visibility of choices 2018-03-27 18:12:42 +02:00
Laurent Destailleur
e28307ede4
Merge pull request #8449 from hregis/develop_dict 
NEW add "moreHtmlRef" hook
 2018-03-27 18:07:57 +02:00
Laurent Destailleur
f054380548
Merge pull request #8460 from dolibarr95/patch-42 
NEW: Add date in goods reception supplier order table
 2018-03-27 18:05:41 +02:00
Frédéric FRANCE
299c32d262 Update actions_sendmails.inc.php 2018-03-27 18:02:27 +02:00
Laurent Destailleur
1a473998d0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-27 18:01:34 +02:00
Laurent Destailleur
db70492983
Merge pull request #8458 from frederic34/patch-9 
FIX Error message not reported when sending emails
 2018-03-27 18:01:24 +02:00
Laurent Destailleur
3fa7cdf17f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-27 18:00:29 +02:00
Laurent Destailleur
20eb7015e8 Doxygen 2018-03-27 18:00:17 +02:00
Laurent Destailleur
4c9ccb163c Remove deprecated way of working. Use context array instead. 2018-03-27 17:58:24 +02:00
Laurent Destailleur
34fae0bd48
Merge pull request #8456 from atm-greg/Fix_bankentries_list 
FIX sql error using no category
 2018-03-27 17:49:01 +02:00
Laurent Destailleur
6b47df6695
Merge pull request #8454 from frederic34/patch-2 
ignore Return-Path in dkim sign with swiftmailer
 2018-03-27 17:48:24 +02:00
Laurent Destailleur
6eca679f68
Merge pull request #8453 from OPEN-DSI/fix-import-insert-foreign-key 
FIX #7581 Import INSERT foreign key
 2018-03-27 17:47:45 +02:00
Laurent Destailleur
d41908e52a
Update import_xlsx.modules.php 2018-03-27 17:46:50 +02:00
Laurent Destailleur
86c4bb23ad
Update import_csv.modules.php 2018-03-27 17:46:28 +02:00
Regis Houssin
2b8fe93fc8 Fix: remove unused global 2018-03-27 17:40:17 +02:00