Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
54,329 Commits 36 Branches 189 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

2751 Commits

Author SHA1 Message Date
Laurent Destailleur
df60754e52 Merge pull request #2708 from GPCsolutions/deprecated 
Deprecated
 2015-06-05 15:44:08 +02:00
Laurent Destailleur
5e2d9efa07 Maxi debug of 3.8. Nearly ready for freeze. 2015-06-05 14:02:50 +02:00
Laurent Destailleur
4c7ccf6145 NEW Can filter on contact status in prospect list. Removed deprecated 
menu entry.
 2015-06-05 10:49:02 +02:00
Laurent Destailleur
14b1fb845f Remove useless tab of categories 2015-06-05 09:57:41 +02:00
Laurent Destailleur
bbd8a712cf Merge pull request #2932 from GPCsolutions/dolibarr-2571 
Added tags/categories management to customers
 2015-06-05 09:44:06 +02:00
Laurent Destailleur
5edef2f02f NEW A module can add its entries into cron module. 2015-06-05 03:32:09 +02:00
Laurent Destailleur
1f92f542a6 NEW Hidden option THEME_ELDY_USE_HOVER is stable enough to become 
officialy visible into setup.
 2015-06-04 13:32:21 +02:00
Laurent Destailleur
8010cb7f33 Fix the extracss parameter was overwritten other css into 
textwithtooltip function.
Add tooltip on THM and TJM parameter of user.
 2015-06-04 10:42:12 +02:00
Laurent Destailleur
dd8a0b849a NEW If module salaries is on, you can set a hourly value for tome 
consumed by users. Each time a user enter its time consumed on a
project, a calculation is done to provide the cost for human services.
This value appears into the "Transversal view" of project.
 2015-06-03 21:01:50 +02:00
Laurent Destailleur
d109c78c6b Fix label of project was not visible 2015-06-03 16:59:48 +02:00
aspangaro
d28a56c8ac Correct travis 2015-06-03 05:49:43 +02:00
aspangaro
ef88a04f93 Fix: Donation error on admin tab 2015-06-02 20:41:02 +02:00
Raphaël Doursenaud
ea798c2315 Qual: deprecate dol_json_encode() and dol_json_decode() 
PHP > 5.3 supports json_encode() and json_decode() natively
 2015-06-01 11:00:11 +02:00
Raphaël Doursenaud
3f9270ea78 Qual: added deprecation hinting 
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
 2015-06-01 11:00:11 +02:00
Laurent Destailleur
1b681510a5 NEW Use new select2 component for juridical status, country and state 
selection.
 2015-05-31 12:25:33 +02:00
Laurent Destailleur
01aad8516d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/adherents/list.php
	htdocs/compta/dons/card.php
	htdocs/compta/dons/class/don.class.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/security.lib.php
	htdocs/main.inc.php
	htdocs/product/stock/massstockmove.php
	htdocs/public/test/test_arrays.php
	htdocs/public/test/test_forms.php
	htdocs/societe/societe.php
 2015-05-31 03:30:38 +02:00
Laurent Destailleur
49f2157f2d Little debug of module resource 2015-05-31 02:05:39 +02:00
Laurent Destailleur
7a0ec2d831 Prototype with datatables works now also ith jmobile. 
Add field fifo and lifo into product table.
 2015-05-30 23:56:42 +02:00
Laurent Destailleur
36b7f1dcf3 NEW Show photo of logged user into login top right block. 
NEW If no photo is available for user, we show a generic photo depending
on gender
 2015-05-30 19:50:07 +02:00
Laurent Destailleur
03c06b3cf8 Merge pull request #2916 from aspangaro/develop-patch23 
FIX: export salaries & NEW: Add tab document on salaries payment
 2015-05-30 15:09:23 +02:00
Raphaël Doursenaud
bbd0b89087 Added tags/categories management to customers 
Customers part of #2571
 2015-05-29 18:50:43 +02:00
Laurent Destailleur
11552e90b7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-29 17:15:27 +02:00
Laurent Destailleur
65c7ab7a93 Fix: Introduce error by default when function is used as a true delete 
function.
 2015-05-29 17:11:42 +02:00
Laurent Destailleur
d925ecb4f1 Revert "Made test pessimistic by default" 2015-05-29 17:09:35 +02:00
Laurent Destailleur
eb62c7e462 Merge pull request #1446 from GPCsolutions/removefiles 
Made test pessimistic by default
 2015-05-29 16:56:28 +02:00
aspangaro
0bd07b795f NEW: Add tab document on salaries payment 2015-05-28 07:33:50 +02:00
Laurent Destailleur
76380c2288 Merge pull request #2898 from defrance69/patch-62 
Tabs collector better identification
 2015-05-25 19:27:39 +02:00
BENKE Charlie
a30d4d4be6 Tabs collector better identification 
Tabs collector goes wrong with 2 tabs in the same page (like projet and task), so we use picto name to identify the 2 tabscollect
We need to substract the @ if the tabs is from a module... eg : factory@factory
 2015-05-25 18:14:49 +02:00
Laurent Destailleur
11d4a945b0 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/contact/list.php
	htdocs/contrat/liste.php
	htdocs/product/liste.php
 2015-05-25 18:08:23 +02:00
Marcos García de La Fuente
460a2ec2ab Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/categories/categorie.php
	htdocs/comm/prospect/list.php
 2015-05-25 15:09:46 +02:00
Steve Braun
d1c7c9489e fixes #2847 2015-05-25 14:56:37 +02:00
Raphaël Doursenaud
becc240b92 Include Categories class whenever Categorie::TYPE is used 2015-05-23 23:35:49 +02:00
Raphaël Doursenaud
ee808cdfd7 Added types constants to categories 2015-05-23 18:52:31 +02:00
Laurent Destailleur
390c7d8e65 Fix link to prospect with filter on commercial status 
Enhance natural_search method to allow to search on several ids.
 2015-05-22 15:19:27 +02:00
Alexis Algoud
bc672c2c23 FIX event for restricted user was restricted if company null 2015-05-21 11:49:10 +02:00
aspangaro
de5a15282c Adherent review 2015-05-20 06:25:43 +02:00
Laurent Destailleur
62e1c55c97 NEW Introduce function dolGetFirstLineOfText 2015-05-19 00:44:05 +02:00
Laurent Destailleur
4a70bb7acf Work on generic usage of get_exdir. 2015-05-18 23:04:49 +02:00
Laurent Destailleur
a258370f8a Prepare code for generic solution where all path are forged using 
get_exdir.
 2015-05-18 22:25:51 +02:00
Laurent Destailleur
4d6b25eb45 Prepare to generalize usage of get_exdir 2015-05-18 21:47:44 +02:00
Laurent Destailleur
e230d72cea Increase default date range to current month instead of current day 2015-05-18 19:41:23 +02:00
Laurent Destailleur
684686e0f6 Fix restore compatibility of new navigation style with jmobile 2015-05-18 08:59:58 +02:00
Laurent Destailleur
d25a2af70c Fix PHPCS 2015-05-17 23:47:15 +02:00
Laurent Destailleur
c89c883d7d Fix the new navigation style. 2015-05-17 19:37:37 +02:00
Marcos García de La Fuente
e2b2c1c8bd Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/societe/class/societe.class.php
 2015-05-15 12:30:03 +02:00
Laurent Destailleur
c33cbefad2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-15 11:16:29 +02:00
Laurent Destailleur
4931401188 Fix new pagination style was not working correctly. 2015-05-15 04:33:01 +02:00
Laurent Destailleur
7b2230e437 Merge pull request #2774 from aspangaro/develop-pagination 
NEW Use larger button for navigation
 2015-05-15 03:57:29 +02:00
Laurent Destailleur
5937cd7f70 NEW Forms are using the tab look, even in creation mode. 2015-05-13 17:53:25 +02:00
Laurent Destailleur
b327b5fb9d Save regressions 2015-05-13 09:32:54 +02:00