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

49892 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
fc1718c0d2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-18 20:57:39 +02:00
Laurent Destailleur
a0e30aa218 Fix #3764 2015-10-18 20:57:28 +02:00
Laurent Destailleur
d0e590f8ea Move variables 2015-10-18 20:56:10 +02:00
Laurent Destailleur
4dc88406ac Merge pull request #3737 from frederic34/patch-15 
Bad chmod for directory when changing product ref
 2015-10-18 20:28:17 +02:00
Laurent Destailleur
b5401edf16 Merge pull request #3769 from marcosgdf/task-3768 
NEW [ task #3768 ] Improve product multiprices view
 2015-10-18 20:26:50 +02:00
Marcos García de La Fuente
12de2d5947 NEW [ task #3768 ] Improve product multiprices view 
Close #3768
 2015-10-18 19:34:27 +02:00
Juanjo Menent
1f05cb844c Merge pull request #3755 from grandoc/develop 
[Qual] Uniformize code
 2015-10-18 12:35:17 +02:00
Juanjo Menent
02c1f37a95 Merge pull request #3747 from fappels/develop-best-pmp-pos-margin 
Qual getSupplierPrices
 2015-10-18 12:10:29 +02:00
Juanjo Menent
16f473f6a4 Merge pull request #3758 from frederic34/patch-16 
Create index.html
 2015-10-18 12:06:12 +02:00
Juanjo Menent
724470788b Merge pull request #3759 from frederic34/patch-17 
Create index.html
 2015-10-18 12:06:01 +02:00
Frédéric FRANCE
c80c0f2c2c Create index.html 2015-10-18 10:07:08 +02:00
Frédéric FRANCE
8e5c7746dc Create index.html 2015-10-18 10:06:35 +02:00
philippe grand
1762b3aaa7 [Qual] Uniformize code 2015-10-17 17:09:34 +02:00
philippe grand
f31ddc23aa [Qual] Uniformize code 2015-10-17 16:18:33 +02:00
Laurent Destailleur
2f46683526 FIX Total in summary was not same than into detail on the referrer page. 2015-10-17 12:28:47 +02:00
Laurent Destailleur
3d94e3d80e FIX Editing a supplier price should keep the vat. 2015-10-17 12:01:17 +02:00
Laurent Destailleur
4eb7e023ed Merge pull request #3752 from All-3kcis/develop-patch-9 
Correct hook param name
 2015-10-17 11:18:47 +02:00
Laurent Destailleur
5db82b8869 Merge pull request #3743 from hregis/develop_origin 
Fix: Parse error: syntax error, unexpected '}'
 2015-10-17 10:37:03 +02:00
Laurent Destailleur
91a2341e88 Add missing column 2015-10-17 03:32:19 +02:00
Laurent Destailleur
3ce147ccc1 Use new architecture for quick search for the account area. 2015-10-17 02:41:09 +02:00
Laurent Destailleur
b748c4e328 Uniformize code 2015-10-17 02:03:59 +02:00
Laurent Destailleur
8c66a7d099 Revert a bad PR. if form_confirm is replaced with formconfirm, we must 
include a print before. It is no more included into function.
 2015-10-17 02:01:13 +02:00
Laurent Destailleur
7fd6d8839a Uniformize code and use a new generic search architecture 2015-10-17 01:40:46 +02:00
Laurent Destailleur
a2382bdde3 FIX Type of leave request is required 2015-10-17 01:32:05 +02:00
Laurent Destailleur
4e3ee259b0 Update doc 2015-10-17 01:09:56 +02:00
Laurent Destailleur
2122d4d43a NEW Contract module can be used to follow both sold and bought 
contracts/recurring subscriptions.
 2015-10-17 00:52:35 +02:00
Laurent Destailleur
537a13e2f4 NEW Show which fields are used for search when doing a generic search 
from the quick search form.
 2015-10-17 00:14:36 +02:00
Laurent Destailleur
45a2156d71 Uniformize code and add more fields selectable for list of thirdparties 2015-10-16 23:03:20 +02:00
Laurent Destailleur
d1d6c72d7d NEW Uniformize way of working for search filters. One filter per object. 2015-10-16 22:21:26 +02:00
Laurent Destailleur
87c12717a7 NEW The thirdparties tabs, the contacts tabs and the members tabs are 
now presented using a new top banner, saving space and using a same way
to show address, status and navigation arrows.
 2015-10-16 20:16:28 +02:00
All-3kcis
ccf144dbae Correct hook param name 
$object => $product
 2015-10-16 16:15:51 +02:00
Laurent Destailleur
df0c6aa5cf Use the new card banner for members 2015-10-16 16:14:33 +02:00
Laurent Destailleur
ebdc402832 No value set when using the generic new thirdparty feature 2015-10-16 15:05:05 +02:00
fappels
0663932589 Add currently used sortfields and sortorder 2015-10-16 12:51:49 +02:00
Laurent Destailleur
dc5cc52395 NEW Merge all search fields of an area page into one search box 2015-10-16 10:52:49 +02:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Laurent Destailleur
8a02c8288b Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/product/index.php
 2015-10-16 09:56:55 +02:00
Laurent Destailleur
9b85a70013 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
 2015-10-16 09:52:38 +02:00
fappels
74c373a3af Qual getSupplierPrices 
use productfourn method list_product_fournisseur_price because query has
same purpose.
 2015-10-15 22:54:42 +02:00
Regis Houssin
d44e961014 Fix: Parse error: syntax error, unexpected '}' 
Fix: bad indentation !!! use tabulation instead spaces please !!!
 2015-10-15 16:35:05 +02:00
Regis Houssin
39d89ef9aa Fix: Parse error: syntax error, unexpected '}' 2015-10-15 16:11:03 +02:00
Laurent Destailleur
b43047bc2f Use the new banner on all tabs of contacts 2015-10-15 14:13:31 +02:00
Laurent Destailleur
8a32041f16 Clean CSS when option MAIN_MAXTABS_IN_CARD is set 2015-10-15 13:31:44 +02:00
Laurent Destailleur
e79fe7401f Merge pull request #3741 from fmarcet/3.8 
FIX #3689 Bug on workflow module
 2015-10-15 13:09:43 +02:00
Laurent Destailleur
577776b950 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-15 12:19:01 +02:00
Laurent Destailleur
e2478eea07 NEW Increase length of bank code to 128 char #3704 2015-10-15 12:18:17 +02:00
fmarcet
4cdf17d8b5 FIX #3689 Bug on workflow module 2015-10-15 12:17:57 +02:00
Laurent Destailleur
7fe92bdf0a Merge pull request #3722 from GPCsolutions/zenfusion-23 
[Qual] Use default data root path if no conf
 2015-10-15 12:06:04 +02:00
Laurent Destailleur
cee0364a1a Merge pull request #3714 from marcosgdf/doactions-usercard 
NEW Add doActions hooks to user card
 2015-10-15 12:05:26 +02:00
Laurent Destailleur
ff1f7f1a48 Merge pull request #3739 from GPCsolutions/3.8-3728 
Fix #3728 Properly remove last category
 2015-10-15 12:00:22 +02:00