Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
79,034 Commits 36 Branches 189 Tags
fec67aade476d54d96db49b200bf53e0927e5eb0
Commit Graph

5391 Commits

Author SHA1 Message Date
Rui Strecht
f1126b65bf Updated method to fetch state name, code and id to match method used with country 
Reverted some previous changes to allow backwards compatibility
Extended MAIN_SHOW_REGION_IN_STATE to include showing region in thirdparty card
 2017-09-20 12:06:35 +01:00
Regis Houssin
1f59e4f7e9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-20 12:47:35 +02:00
Laurent Destailleur
8dfa87fcf6 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-19 19:30:28 +02:00
Laurent Destailleur
c38ed54990 Disable old datepicker 2017-09-19 17:31:37 +02:00
Laurent Destailleur
5f7631a95d NEW Days where user is on vacation use different colors in timesheet. 2017-09-19 17:07:39 +02:00
Laurent Destailleur
2a04d497da Use a different css into timespent entry page when user is on holiday 2017-09-19 16:40:55 +02:00
Laurent Destailleur
978702d04b Fix false deprecated warning 2017-09-19 01:41:57 +02:00
Laurent Destailleur
b723d2c2d2 Fix scrutinizer bugs 2017-09-19 01:39:22 +02:00
Rui Strecht
76a2513c76 Added self to contributors list 2017-09-18 17:49:31 +01:00
Rui Strecht
998eea09bd Added new option MAIN_SHOW_STATE_CODE (on/off; 1/0) to show state code in select fields options and values. 
Changed option MAIN_SHOW_REGION_IN_STATE to on/off - 1/0 and to mix with the new MAIN_SHOW_STATE_CODE (can show region name and state code)
 2017-09-18 16:48:13 +01:00
arnaud
e7bb7a3588 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element 2017-09-18 17:28:03 +02:00
arnaud
9795f48046 NEW comment system working with all objects 2017-09-18 17:27:29 +02:00
Laurent Destailleur
70b11f18b5 FIX #7367 2017-09-18 16:06:58 +02:00
Laurent Destailleur
da6b1e92b2 NEW Add the total in the perday view of the time spent form. 2017-09-18 14:18:34 +02:00
Laurent Destailleur
85d59b32b3 Add timespent entry into HR top menu too 
Faster update of total of timespent
 2017-09-18 13:15:24 +02:00
Regis Houssin
f550e27579 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-18 12:15:01 +02:00
Laurent Destailleur
0355b0d9ed Merge pull request #7414 from aspangaro/7.0-4 
Accountancy - Finish moving admin to specific menu & some cleaning
 2017-09-18 11:16:36 +02:00
Regis Houssin
a03ef95eaa Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/install/mysql/tables/llx_c_payment_term.sql
 2017-09-18 09:11:04 +02:00
Laurent Destailleur
e244ee6715 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-17 21:17:04 +02:00
Laurent Destailleur
2c3428a1bf Fix css 2017-09-17 20:48:09 +02:00
Laurent Destailleur
a3c555049d NEW Add supplier proposals into stats of product page. 2017-09-17 18:08:23 +02:00
Laurent Destailleur
ab5724e7ff Mutualize code for forms to send emails. Remove thousand line of code. 2017-09-17 17:12:14 +02:00
Regis Houssin
bdc425c203 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-16 21:41:55 +02:00
Regis Houssin
87b81fb2fd NEW add members types ldap group management 2017-09-16 21:41:30 +02:00
Laurent Destailleur
630dc92a13 NEW Mass PDF Merging is available on contracts 2017-09-16 15:39:52 +02:00
Laurent Destailleur
695c231e78 Update code comment 2017-09-16 10:26:27 +02:00
Laurent Destailleur
bd7c4fe940 NEW Summary of last events on a card are sorted on decreasing date. 2017-09-16 10:12:44 +02:00
Laurent Destailleur
4e7e6cc658 Fix W3C 2017-09-16 09:15:10 +02:00
Alexandre SPANGARO
c2e1e2491d Accountancy - Finish moving admin to specific menu & some cleaning 2017-09-16 06:53:29 +02:00
Laurent Destailleur
961d475a9d More complete substitution system. 
Add __CONTRACT_NEXT_EXPIRATION_DATE__  and
__CONTRACT_NEXT_EXPIRATION_DATETIME__
 2017-09-16 03:45:29 +02:00
Laurent Destailleur
b13dbf1f06 Clean code. Make selection of template working even if public. 2017-09-16 00:49:46 +02:00
Laurent Destailleur
087e22ab94 Fix bad status picto 2017-09-16 00:14:39 +02:00
Regis Houssin
db17eb80ec Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/facture/class/paymentterm.class.php
 2017-09-15 16:45:49 +02:00
Laurent Destailleur
25c4dba8a0 Merge pull request #7402 from hregis/develop_ldap 
NEW: Add hook addAdminLdapOptions and doAction in ldap admin page
 2017-09-15 15:51:38 +02:00
tysauron
2abb38afdf Beaucoup beaucoup plus rapide 
Pour moi passe de 4 secondes a 0,8 (grosse base)
 2017-09-15 12:48:57 +02:00
Laurent Destailleur
0ade500535 Better support of text editor when no js available. 2017-09-15 11:19:56 +02:00
Laurent Destailleur
e02c220c08 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-15 11:04:27 +02:00
Laurent Destailleur
cce1549f66 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/card.php
	htdocs/public/members/new.php
 2017-09-15 11:02:34 +02:00
Regis Houssin
b9e0879847 NEW: Add hook addAdminLdapOptions and doAction in ldap admin page 
NEW: complete_head_from_modules() in ldap_prepare_head()
 2017-09-15 10:57:22 +02:00
Laurent Destailleur
8f5206accf NEW The lot of a product uses the link and picto when shown into list. 2017-09-15 10:45:41 +02:00
Laurent Destailleur
f16d88fd53 FIX #7391 2017-09-14 13:17:31 +02:00
Laurent Destailleur
2f80618545 Merge pull request #7390 from atm-arnaud/FIX_task_comment_design 
Fix task comment design
 2017-09-14 12:21:58 +02:00
Regis Houssin
a494e01f00 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-09-14 12:07:19 +02:00
Laurent Destailleur
2d7916f77d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/core/lib/json.lib.php
 2017-09-14 11:49:02 +02:00
Laurent Destailleur
fe1ce5b3ac Fix php 7.2 compatibility 2017-09-14 11:44:47 +02:00
Laurent Destailleur
205989b64b Fix phpunit 2017-09-14 09:16:57 +02:00
Laurent Destailleur
b3b00f63e4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-13 22:30:43 +02:00
Laurent Destailleur
fed3165b53 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/core/lib/price.lib.php
 2017-09-13 21:53:03 +02:00
Laurent Destailleur
6d40f797d2 Fix regression 2017-09-13 21:50:14 +02:00
Laurent Destailleur
eadfbfe2bd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/lib/functions2.lib.php
 2017-09-13 20:57:53 +02:00