lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,922 Commits 43 Branches 150 Tags 886 MiB
7974ae96ad
Commit Graph

40922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
7974ae96ad Merge branch 'cat_extrafields' of https://github.com/aternatik/dolibarr 
into aternatik-cat_extrafields

Conflicts:
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
 2014-03-16 21:38:29 +01:00
Laurent Destailleur
b1498c584d Merge branch 'dluo_step5' of https://github.com/KreizIT/dolibarr into 
KreizIT-dluo_step5

Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-03-16 20:49:56 +01:00
Laurent Destailleur
5e0fc558b9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-16 20:38:02 +01:00
Laurent Destailleur
eb5e891cf9 Fix: Not mandatory field must not be not null 
Fix: field to store amount must be double(24,8)
 2014-03-16 20:37:43 +01:00
Laurent Destailleur
12e2909564 Merge pull request #1490 from GPCsolutions/release 
Makepack improvements
 2014-03-16 20:32:26 +01:00
Laurent Destailleur
58add21719 Merge pull request #1488 from atm-maxime/mko1300 
Add task 1300 : Add thm field on user and time spent to be able to calculate employee cost
 2014-03-16 20:26:57 +01:00
Laurent Destailleur
b530488da1 Merge pull request #1487 from atm-maxime/mkoPHPUnit 
New PHPUnit test on project + clean initAsSpecimen
 2014-03-16 20:25:49 +01:00
Laurent Destailleur
599142566e Merge pull request #1492 from aspangaro/develop 
Fix :: Failed to apply auguria_menu
 2014-03-16 20:25:13 +01:00
aspangaro
5175dcf135 Update also eldy menu 2014-03-16 20:17:25 +01:00
Laurent Destailleur
2d3c700a7d Fix: When cloning product, autogenerating barcode must not use same 
number.
Qual: Moved dedicated permission of module to "advance" permissions.
 2014-03-16 17:37:54 +01:00
aspangaro
b09d7065c9 Fix :: Failed to apply auguria_menu since integration of salary payment in tax module 2014-03-16 17:30:58 +01:00
Jean-François Ferry
5034356899 Manage extrafields deletion on categories 2014-03-16 16:06:32 +01:00
Jean-François Ferry
e2b47b9919 Category extrafields on categories: edit and view 2014-03-16 16:04:18 +01:00
Jean-François Ferry
d9baae3456 Implement extrafields into category create 2014-03-16 15:25:13 +01:00
Raphaël Doursenaud
0d511f9659 Readme: default to markdown version 2014-03-16 15:01:06 +01:00
Jean-François Ferry
f14d2fbfe0 Add information message for option into categories setup 2014-03-16 15:00:10 +01:00
Jean-François Ferry
55750e16d8 Prepare extrafields into categories 2014-03-16 14:48:46 +01:00
Maxime Kohlhaas
0083e529c7 Add task 1300 : Add thm field on user and time spent to be able to calculate employee cost 2014-03-16 14:31:02 +01:00
Raphaël Doursenaud
991d0e2a30 Makepack: clean git artifacts 2014-03-16 14:26:14 +01:00
Laurent Destailleur
dba37d74ed Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-16 14:21:50 +01:00
Laurent Destailleur
291d546c30 Qual: Removed useless code 2014-03-16 14:21:23 +01:00
Maxime Kohlhaas
fe767606da New PHPUnit test on project + clean initAsSpecimen 2014-03-16 13:55:32 +01:00
Laurent Destailleur
b40835c592 Merge pull request #1486 from aternatik/fix_img_cat 
Fix: bad id when deleting picture on categorie / missing lang
 2014-03-16 13:51:39 +01:00
Jean-François Ferry
7e6777f344 Fix: bad id when deleting picture on categorie / missing lang 2014-03-16 13:49:44 +01:00
Laurent Destailleur
3e4838e92d Merge pull request #1485 from atm-maxime/mkoPHPUnit 
Add new PHPUnit test on Entrepot
 2014-03-16 13:43:07 +01:00
Maxime Kohlhaas
233a8fa917 Add new PHPUnit test on Entrepot 2014-03-16 11:38:39 +01:00
Maxime Kohlhaas
4d48034ad1 Fix 2014-03-16 09:50:03 +01:00
KreizIT
9be2bb0e60 Travis Fix 2014-03-16 07:00:27 +01:00
Laurent Destailleur
6eac7e1bdc Fix: CRLF 2014-03-15 23:17:46 +01:00
Laurent Destailleur
cafa61ef7d Fix: Use correct syntax of date into sql requests (with quotes) 2014-03-15 23:12:00 +01:00
Laurent Destailleur
104f2873da Qual: Remove code to fix dynamically bad code. 2014-03-15 22:30:40 +01:00
Laurent Destailleur
739f80b46e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-15 21:46:49 +01:00
Laurent Destailleur
7e11551199 Fix: CRLF 2014-03-15 21:45:33 +01:00
Laurent Destailleur
987acd233d Update log 2014-03-15 21:35:21 +01:00
Laurent Destailleur
e325921999 Merge pull request #1484 from atm-maxime/develop 
Fix : Delivery date was displayed twice
 2014-03-15 20:55:36 +01:00
Maxime Kohlhaas
685c00cd27 Fix : Delivery date was displayed twice 2014-03-15 17:55:57 +01:00
Laurent Destailleur
c41bffcb25 Merge pull request #1482 from jfefe/patch-2 
Remove debug infos into agenda index
 2014-03-15 17:29:54 +01:00
Laurent Destailleur
ad23c88f1a Merge pull request #1481 from atm-maxime/mko672 
Add : Stock can be mandatory to use a product
 2014-03-15 17:29:31 +01:00
Laurent Destailleur
f9e0660802 Merge pull request #1480 from atm-alexis/develop 
Add option to set value of credit note by invoice remaining to pay
 2014-03-15 17:23:40 +01:00
Laurent Destailleur
bba7778a36 Merge pull request #1479 from ndrosis/patch-1 
Update user.class.php
 2014-03-15 17:21:12 +01:00
Simnandez
4e73e4e7c7 Update es_ES from transifex 2014-03-15 16:49:18 +01:00
Simnandez
5216a14e37 Trad: Update es_ES from transifex 2014-03-15 16:36:25 +01:00
Laurent Destailleur
c9ac7fad82 Fix: Field should not be not null 2014-03-15 15:45:21 +01:00
jfefe
f648f85b61 Remove debug infos into agenda index 2014-03-15 15:44:02 +01:00
Laurent Destailleur
6a72ebbe76 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-15 15:10:45 +01:00
Laurent Destailleur
5e55619975 Fix: sql syntax error with pgsql 2014-03-15 15:10:03 +01:00
Maxime Kohlhaas
1911f6fcdc Task 672 : add stock limitation on shipment + translation 2014-03-15 14:59:27 +01:00
Alexis Algoud
839641feaf Add option to set value of credit note by invoice lake of payment 2014-03-15 14:52:08 +01:00
Drosis Nikos
8ff0022a53 Update user.class.php 
String translated twice
 2014-03-15 15:23:41 +02:00
Laurent Destailleur
7a304bff62 Merge pull request #1478 from atm-alexis/develop 
Add feature : import line from origin invoice in the new credit note
 2014-03-15 13:48:12 +01:00