lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
51,192 Commits 43 Branches 150 Tags 886 MiB
51640c19bb
Commit Graph

51192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
633055fe5b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-22 19:44:00 +02:00
Laurent Destailleur
1000fd1b21 Add field employee for hr module 2015-10-22 19:43:50 +02:00
Laurent Destailleur
8df59134a9 Merge pull request #3705 from aspangaro/develop-hrm 
New : Module HRM
 2015-10-22 19:15:49 +02:00
Laurent Destailleur
531ef43a27 Some minor look fixes. 2015-10-22 19:13:16 +02:00
Laurent Destailleur
cac4a85ccd Merge pull request #3788 from atm-maxime/new_customer_recap 
New customer recap
 2015-10-22 18:02:38 +02:00
Laurent Destailleur
0440e313d2 Merge pull request #3787 from atm-maxime/3.8 
Fixes on invoice list and creation
 2015-10-22 17:58:04 +02:00
Laurent Destailleur
9f21ea58a3 A lot hooks used into PDF generation were not correctly implemented. We 
had to fix this. The result si that
the following hook were set as hook of type "replace". This means if
your module implement such hooks, it must 
return 0 to execute standard code or 1 to replace standard code (value
to output should be set into resPrints instead).
 2015-10-22 17:51:05 +02:00
Laurent Destailleur
56ef1c7338 Fix missing ) 2015-10-22 17:05:28 +02:00
Maxime Kohlhaas
ef2337a338 Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8 
Conflicts:
	htdocs/compta/facture/list.php
 2015-10-22 14:41:58 +02:00
All-3kcis
00c2b1a32a move db->begin() before trigger 2015-10-22 14:30:11 +02:00
Maxime Kohlhaas
81bf54a6cd Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2015-10-22 14:23:10 +02:00
Laurent Destailleur
77c43ebb26 FIX #3558 2015-10-22 14:08:19 +02:00
Laurent Destailleur
2615e02e1e Update doc 2015-10-22 13:18:51 +02:00
Laurent Destailleur
876eae7c5a git push origin developMerge branch 'defrance-patch-77' into develop 2015-10-22 13:13:27 +02:00
Laurent Destailleur
9cce56895c Merge branch 'patch-77' of https://github.com/defrance/dolibarr into 
defrance-patch-77

Conflicts:
	htdocs/core/lib/admin.lib.php
 2015-10-22 13:13:02 +02:00
Laurent Destailleur
3d7050e051 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-22 12:29:35 +02:00
Laurent Destailleur
9cbb9129c2 FIX #3772 2015-10-22 12:29:24 +02:00
Laurent Destailleur
ce681081c1 Merge pull request #3776 from frederic34/patch-15 
Set warehouse for order
 2015-10-22 12:16:40 +02:00
All-3kcis
ceae04b76e move trigger before query 2015-10-22 12:03:01 +02:00
Laurent Destailleur
d55f138fb1 Merge pull request #3785 from frederic34/patch-19 
FIX Error message not returne into update fournisseur.commande.class.php
 2015-10-22 10:43:10 +02:00
Laurent Destailleur
b4c2fc7101 Merge pull request #3782 from frederic34/patch-17 
Add draft suppliers orders in /comm/index
 2015-10-22 10:42:07 +02:00
Laurent Destailleur
c682065ca4 Merge pull request #3780 from frederic34/patch-16 
Fix some action has no effect in shipment
 2015-10-22 10:40:28 +02:00
Laurent Destailleur
a5912d1909 Merge pull request #3778 from grandoc/develop 
[Qual] Uniformize code
 2015-10-22 10:39:55 +02:00
Laurent Destailleur
f312ee58de Merge pull request #3779 from All-3kcis/develop-patch-10 
Correct return value
 2015-10-22 10:35:55 +02:00
Laurent Destailleur
43f003f6f9 Merge pull request #3783 from frederic34/patch-18 
Fix lost searchstatus on next page list
 2015-10-22 10:35:40 +02:00
Laurent Destailleur
24919b1f3d Merge pull request #3781 from jpfox/patch-1 
fix test against empty amount on book update
 2015-10-22 10:35:26 +02:00
Laurent Destailleur
40adaf716d Uniformize index names 2015-10-22 10:33:42 +02:00
Laurent Destailleur
4453ba53fd Fix migration error 2015-10-22 10:28:59 +02:00
frederic34
865e9d9738 Merge remote branch 'upstream/develop' into patch-15 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2015-10-22 10:28:06 +02:00
Laurent Destailleur
8bdbed69c9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2015-10-22 10:22:54 +02:00
Laurent Destailleur
81d4148f4a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-22 09:50:26 +02:00
Laurent Destailleur
474692e71a Remove duplicate page fourn/list.php 2015-10-22 09:48:16 +02:00
Laurent Destailleur
7daf9d10af Work on the new selectArrayAjax widget 2015-10-21 20:50:27 +02:00
Laurent Destailleur
fd72b4a400 Work on the new selectArrayAjax widget 2015-10-21 20:43:11 +02:00
Frédéric FRANCE
4689b0cc11 Update fournisseur.commande.class.php 2015-10-21 17:31:51 +02:00
philippe grand
c9d1b72087 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-10-21 13:43:04 +02:00
All-3kcis
ca8c1adf55 Add trigger "SUPPLIER_PRODUCT_BUYPRICE_DELETE" for frounisseur.product remove_product_fournisseur_price() 2015-10-21 10:07:53 +02:00
BENKE Charlie
ef79bb3b67 Update dict.php 2015-10-21 05:23:49 +02:00
BENKE Charlie
88ca8d2ace Update dict.php 2015-10-21 05:22:33 +02:00
BENKE Charlie
ec9955986f Update admin.lib.php 2015-10-21 05:07:13 +02:00
BENKE Charlie
4f519b5747 Update admin.lib.php 2015-10-21 05:06:19 +02:00
Laurent Destailleur
9a1ec900bd NEW Add into about page, a sample text to use to promote new version 
release (visible only if version is last stable)
 2015-10-21 00:31:32 +02:00
Frédéric FRANCE
73f13045c1 Update index.php 2015-10-20 18:24:14 +02:00
Frédéric FRANCE
15733f5ed0 Update propal.lang 2015-10-20 18:23:30 +02:00
Frédéric FRANCE
be85943d13 Update orders.lang 2015-10-20 18:21:28 +02:00
Frédéric FRANCE
2989a94458 Update index.php 2015-10-20 18:19:32 +02:00
Frédéric FRANCE
4062e7474d Update index.php 2015-10-20 18:05:21 +02:00
Frédéric FRANCE
5237a2afc7 Fix lost searchstatus on next page list 2015-10-20 17:45:24 +02:00
Frédéric FRANCE
506b251f24 Update orders.lang 2015-10-20 17:02:04 +02:00
Frédéric FRANCE
d9a56ef418 Update index.php 2015-10-20 17:00:34 +02:00