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
Regis Houssin
34c484dea7 Fix: missing adherent type 2018-03-29 19:16:39 +02:00
Laurent Destailleur
99ada20f6d Add picto bank 2018-03-29 19:08:51 +02:00
Regis Houssin
0e4d796f88 Fix: more complete 2018-03-29 18:47:53 +02:00
Regis Houssin
38912d6918 Fix: more complete 2018-03-29 18:36:51 +02:00
Regis Houssin
c4ce543294 Fix: backward compatibility 2018-03-29 18:30:31 +02:00
Regis Houssin
443ffe3150 Fix: remove html tags and decode html entities 2018-03-29 17:51:23 +02:00
Marc de Lima Lucio
1cc816ff38 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-03-29 17:36:30 +02:00
Marc de Lima Lucio
a574712dd2 Merge branch 'NEW_mail_project' of github.com:ATM-Consulting/dolibarr into develop_atm 2018-03-29 17:36:08 +02:00
Laurent Destailleur
0978c8f58b CSS 2018-03-29 16:07:49 +02:00
Laurent Destailleur
2e22c13062 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-29 15:31:35 +02:00
Laurent Destailleur
fdfcb96176 Fix length of combobox 2018-03-29 15:31:21 +02:00
Philippe GRAND
bad970ff05 cleaning code 2018-03-29 15:04:48 +02:00
Laurent Destailleur
7c394733e4
Merge pull request #8445 from ATM-Consulting/develop_atm 
NEW: bank reconcile: checkbox to select all bank operations
 2018-03-29 14:49:41 +02:00
Laurent Destailleur
a214d0b3d7
Merge pull request #8461 from hregis/develop_multicompany 
Fix: best visibility of choices
 2018-03-29 13:58:30 +02:00
Laurent Destailleur
b5c53e9d76
Merge pull request #8469 from ATM-Marc/NEW_product_default_warehouse 
NEW: default warehouse field for products
 2018-03-29 13:51:37 +02:00
Laurent Destailleur
6d796cfd26
Update llx_product.sql 2018-03-29 13:50:29 +02:00
Laurent Destailleur
03fe0d6b9e
Update 7.0.0-8.0.0.sql 2018-03-29 13:50:08 +02:00
Laurent Destailleur
39758625b7
Merge pull request #8471 from atm-ph/fix_6.0_error_creating_soc 
Fix error on creating company with external module in 'custom' folder…
 2018-03-29 13:48:36 +02:00
Laurent Destailleur
0e986b8f97
Update societe.class.php 2018-03-29 13:48:09 +02:00
Laurent Destailleur
f2022241e3
Merge pull request #8466 from aspangaro/8.0-a11 
Add label project in tooltip in customer/supplier list
 2018-03-29 13:44:13 +02:00
Laurent Destailleur
af11daf186
Merge pull request #8467 from hregis/develop_bug3 
Fix: missing encrypt for llx_const
 2018-03-29 13:43:53 +02:00
Laurent Destailleur
b12752c9a9
Merge pull request #8463 from hregis/develop_dict 
Fix: differentiate context "card", "contact" and "agenda
 2018-03-29 13:41:27 +02:00
Laurent Destailleur
839ebb428b
Merge pull request #8477 from ggg44473/7.0 
Fix wrong approve time in expense report
 2018-03-29 13:40:33 +02:00
Laurent Destailleur
8881dc4518
Merge pull request #8464 from grandoc/new_branch_27-03-2018 
New [*use loadLangs for translation files*] and update code
 2018-03-29 13:40:02 +02:00
Laurent Destailleur
92cbcd9ccb
Merge pull request #8462 from atm-florian/7.0 
Fix error log
 2018-03-29 13:38:35 +02:00
Laurent Destailleur
d6dd7f87cd
Merge pull request #8468 from hregis/develop_ldap 
NEW Better performance with openldap
 2018-03-29 13:37:34 +02:00
Laurent Destailleur
6ccdb52229 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-29 13:30:22 +02:00
Laurent Destailleur
eee1cd9120 Fix data corrupted by v7 2018-03-29 13:29:23 +02:00
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