lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,007 Commits 43 Branches 150 Tags 886 MiB
2795d27cc9
Commit Graph

46007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
2795d27cc9 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang
	htdocs/projet/index.php
 2015-03-01 16:13:22 +01:00
Laurent Destailleur
8a00109baf Fix: Several bugs int replenishment feature. 2015-03-01 16:05:20 +01:00
Laurent Destailleur
560f1a43cd Fix: Several bugs int replenishment feature. 2015-03-01 16:04:34 +01:00
Laurent Destailleur
5f29942257 Fix link missing icon 2015-03-01 14:03:14 +01:00
Laurent Destailleur
9b0dce2e34 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/lib/agenda.lib.php
 2015-03-01 13:58:56 +01:00
Laurent Destailleur
be033c1947 Fix bad position of html tags 
Conflicts:
	htdocs/opensurvey/card.php
 2015-03-01 13:54:24 +01:00
Laurent Destailleur
f6314dd3ad Fix bad position of html tags 2015-03-01 13:48:45 +01:00
Laurent Destailleur
f2fb040a9c Fix align 2015-03-01 13:48:00 +01:00
Laurent Destailleur
b888a04af9 Reduce a lot of duplicate code. Move all tables of extrafields setup 
into a tpl file.
 2015-02-28 20:14:26 +01:00
Laurent Destailleur
f8e9a38e5c Fix: Avoid empty table into setup when module are missing. 2015-02-28 19:37:44 +01:00
Laurent Destailleur
51fff77355 Fix: time 0 must be different than time unknown. 2015-02-28 19:02:03 +01:00
Laurent Destailleur
7baaf18ad1 Fix can be null 2015-02-28 18:44:06 +01:00
Laurent Destailleur
1c9eec1a17 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-02-28 18:18:58 +01:00
Laurent Destailleur
1cdd77a671 Fix: use bad var 2015-02-28 18:18:41 +01:00
Laurent Destailleur
804058c25e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-28 18:10:54 +01:00
Laurent Destailleur
4d226885cb Rewrite code for supplier order and invoice to use shared code of 
customer supplier and invoice.
Work on extrafield for supplier order and invoice.
 2015-02-28 18:10:31 +01:00
Laurent Destailleur
8e26c71fa7 Rewrite code for supplier order and invoice to use shared code of 
customer supplier and invoice.
Work on extrafield for supplier order and invoice.
 2015-02-28 04:59:27 +01:00
Laurent Destailleur
ef14e4e7ed Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.product.class.php
 2015-02-28 03:11:15 +01:00
Juanjo Menent
a67d0f712c Trad: Syncro from transifex 2015-02-27 18:21:41 +01:00
Juanjo Menent
8c6ee6b7a8 Trad: Syncro from transifex 2015-02-27 18:20:35 +01:00
Juanjo Menent
856c8f24de Fix: Bad SEPA xml file creation 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
 2015-02-27 18:14:45 +01:00
Juanjo Menent
88d1d203d8 Fix: Bad SEPA xml file creation 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
 2015-02-27 18:13:24 +01:00
Laurent Destailleur
5d1545ad1f Work on supplier order and customer extrafields 
Use templates to show/edit supplier order and invoice lines
 2015-02-27 18:05:12 +01:00
Juanjo Menent
7ca8fdb20c PHP norms 2015-02-27 17:58:19 +01:00
Juanjo Menent
bfe9bf7a47 Fix: Bad SEPA xml file creation 2015-02-27 17:55:15 +01:00
Laurent Destailleur
828716420b Comment of function was not correct 2015-02-26 16:19:45 +01:00
Laurent Destailleur
a87c867c28 Translation 2015-02-26 16:02:03 +01:00
Laurent Destailleur
8f378b4480 Fix no error returned when contact already exists 2015-02-26 15:52:14 +01:00
Laurent Destailleur
d6438a51ab Add log to help track bug 2015-02-26 15:24:15 +01:00
Laurent Destailleur
4bde7e9f51 Fix: Missing error management 2015-02-26 14:25:30 +01:00
Laurent Destailleur
22318bb800 Fix missing tables 2015-02-26 14:05:23 +01:00
Laurent Destailleur
daabc113a5 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	README.md
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
 2015-02-26 13:36:07 +01:00
Laurent Destailleur
fe7889e266 Fix trigger to insert lines where called when inserting line but also 
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
 2015-02-26 13:19:19 +01:00
Laurent Destailleur
41a74c62e2 Fix trigger to insert lines where called when inserting line but also 
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
 2015-02-26 13:03:17 +01:00
Laurent Destailleur
386eaf0911 Fix: bad sql request 2015-02-26 12:11:31 +01:00
Laurent Destailleur
b9d3175897 Fix typo 2015-02-25 23:04:13 +01:00
Laurent Destailleur
be529e7269 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-02-25 16:53:33 +01:00
Laurent Destailleur
76640b6b77 Fix removed warning 2015-02-25 15:01:25 +01:00
Laurent Destailleur
89684748c5 Debug incdec option. 2015-02-24 19:55:59 +01:00
Laurent Destailleur
d688db3b78 Merge branch 'atm-alexis-feature_Product_stock_subproduct_stock_independent' into develop 2015-02-24 17:24:11 +01:00
Laurent Destailleur
1c04af2e55 Merge branch 'feature_Product_stock_subproduct_stock_independent' of 
https://github.com/atm-alexis/dolibarr into
atm-alexis-feature_Product_stock_subproduct_stock_independent

Conflicts:
	htdocs/langs/en_US/products.lang
 2015-02-24 17:23:23 +01:00
Laurent Destailleur
3fb3e4af4e Merge pull request #2386 from lrq3000/3.7 
Fix lastrowid-*table* option when defining imports
 2015-02-24 17:16:17 +01:00
Laurent Destailleur
fec9e222b1 Merge pull request #2391 from aspangaro/develop-patch10 
FIXED: Module Expense Report - Correct init
 2015-02-24 17:11:32 +01:00
Laurent Destailleur
72da9b52af Merge pull request #2380 from marcosgdf/bug-1825 
Better fix for bug 1825
 2015-02-24 17:07:17 +01:00
Laurent Destailleur
fd9fc191fc Merge pull request #2388 from aspangaro/develop-patch8 
Module Expense Report: reactivate conflict with modDeplacement
 2015-02-24 17:06:43 +01:00
Laurent Destailleur
625c494dee Merge pull request #2385 from aspangaro/3.7-patch5 
FIXED: Bankjournal is generated from id_account now
 2015-02-24 17:04:01 +01:00
Laurent Destailleur
f23234356e Merge pull request #2387 from aspangaro/develop-patch7 
Move new module Expense Report in hrm
 2015-02-24 17:03:12 +01:00
Laurent Destailleur
e8e81dba2b Merge pull request #2392 from aschio/develop 
NEW: added fields and relative filters in contracts list page
 2015-02-24 17:02:47 +01:00
Laurent Destailleur
84581212db Merge pull request #2395 from aspangaro/develop-patch13 
NEW: Add button to purge search criteria into list of expense report
 2015-02-24 17:02:08 +01:00
Laurent Destailleur
57ecb543ae Merge pull request #2393 from aspangaro/develop-patch11 
FIXED: Correct field note - Add note_private & use wysiwyg editor
 2015-02-24 17:01:53 +01:00