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

46039 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
c0d0fa317b Merge pull request #2404 from frederic34/patch-3 
Update card.php
 2015-03-02 02:05:40 +01:00
Laurent Destailleur
5a541c4206 Forgot to commit one file 2015-03-02 01:39:08 +01:00
Laurent Destailleur
2f24622a7c NEW: Introduce TCPDI as replacement of FPDI. 2015-03-02 01:38:40 +01:00
Laurent Destailleur
ba98f6f94a Fix: Bad management of error 2015-03-02 01:05:12 +01:00
Laurent Destailleur
495d066cfc Merge pull request #2378 from aspangaro/develop-patch6 
Update TCPDF library to 6.2.6
 2015-03-02 00:45:50 +01:00
Laurent Destailleur
9b2a90b468 Fix: all home area pages has the search box first. 2015-03-02 00:43:17 +01:00
Laurent Destailleur
2dcbb6ada5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-02 00:41:57 +01:00
Laurent Destailleur
ef89ff6601 Merge pull request #2402 from aspangaro/develop-patch14 
NEW: Add a search field and report on hrm area
 2015-03-02 00:41:43 +01:00
Laurent Destailleur
0774669331 Update comment 2015-03-02 00:37:47 +01:00
Laurent Destailleur
f81cb81e67 Merge pull request #2405 from frederic34/patch-5 
phpcs
 2015-03-02 00:31:50 +01:00
Laurent Destailleur
50d8137618 Merge pull request #2384 from marcosgdf/better-practice 
Better practice in getBrowserInfo
 2015-03-02 00:28:40 +01:00
Laurent Destailleur
7fc0c2b485 Merge pull request #2397 from atm-alexis/new_add_doc_on_project_linked_elements 
New add doc on project linked elements
 2015-03-02 00:19:21 +01:00
Laurent Destailleur
a0f8b39250 Prepare code for a perday week timesheet input of time spent. 2015-03-01 17:45:36 +01:00
Laurent Destailleur
416e0a766e Fix: we must use status to find label of status 2015-03-01 16:24:02 +01:00
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
Marcos García de La Fuente
8dffe2a910 Corrected FunctionsLibTest:testGetBrowserInfo 2015-02-28 19:33:19 +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
Marcos García de La Fuente
60e2524fc2 Merge remote-tracking branch 'upstream/develop' into better-practice 
Conflicts:
	htdocs/core/lib/functions.lib.php
	test/phpunit/FunctionsLibTest.php
 2015-02-28 14:39:14 +01:00
Frédéric FRANCE
eb2cc110fc phpcs 2015-02-28 10:49:14 +01:00
Frédéric FRANCE
84b5888cd5 Update card.php 2015-02-28 10:45:48 +01:00
aspangaro
105dcde7aa Key language 2015-02-28 08:50:47 +01:00
aspangaro
78af862c19 NEW: Add a search field and report on hrm area 2015-02-28 08:46:40 +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