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

47042 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian HENRY
adad1f4a3b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-18 22:43:56 +02:00
Juanjo Menent
21a68b2cf2 Merge pull request #2661 from Diciannove/langtool 
fixes issue #2584
 2015-04-18 22:38:43 +02:00
Tommaso Basilici
38cfbe4897 issue #2584 - added a counter 2015-04-18 22:37:23 +02:00
Florian HENRY
c678a31d97 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-18 22:24:55 +02:00
Laurent Destailleur
70de42f576 Merge pull request #2658 from bafbes/develop 
Register contributor information for last pull request
 2015-04-18 22:23:59 +02:00
Laurent Destailleur
80e1ca73fb Merge pull request #2659 from FHenry/develop 
fix : #2640
 2015-04-18 22:23:28 +02:00
Tommaso Basilici
b73c36c85d Merge branch 'langtool' of https://github.com/Diciannove/dolibarr into langtool 2015-04-18 22:19:33 +02:00
Juanjo Menent
98e2284566 Merge pull request #2660 from marcosgdf/develop 
Close #2657 Bug: CRITICAL Dolibarr is broken
 2015-04-18 22:19:01 +02:00
Tommaso Basilici
7cec7879e4 issue #2584 - output on a table + search for unused strings 2015-04-18 22:18:46 +02:00
Florian HENRY
dc1d41d529 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-18 22:15:12 +02:00
Marcos García de La Fuente
a8f60a5c18 Revert "Sanitize for security." 
This reverts commit 1598a5d3a6.
 2015-04-18 22:11:11 +02:00
Florian HENRY
92494cd1ec fix : #2640 2015-04-18 22:09:19 +02:00
bafbes
f4fe71a7fe Update filefunc.inc.php 2015-04-18 20:59:00 +01:00
Laurent Destailleur
25a996644d Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into develop 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-04-18 20:52:02 +02:00
Marcos García de La Fuente
e2e6049c7f Copyright 2015-04-18 20:50:03 +02:00
Laurent Destailleur
d22a403416 git push origin developMerge branch 'marcosgdf-fr-2613' into develop 2015-04-18 20:47:41 +02:00
Laurent Destailleur
9dd73de9b0 Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into marcosgdf-fr-2613 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-04-18 20:47:20 +02:00
Laurent Destailleur
1598a5d3a6 Sanitize for security. 2015-04-18 20:43:52 +02:00
Marcos García de La Fuente
c07e26dcac Merge branch 'develop' into fr-2613 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-04-18 20:42:57 +02:00
Marcos García de La Fuente
dc790ff586 NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
Laurent Destailleur
21a6fd1cb4 Merge pull request #2633 from bafbes/develop 
NEW : dev feature : replace conf filename with "conf" parameter on url b...
 2015-04-18 20:30:49 +02:00
Laurent Destailleur
f80674f1e3 git push origin developMerge branch 'fappels-develop' into develop 2015-04-18 20:29:55 +02:00
Laurent Destailleur
8be83cd043 Merge branch 'develop' of https://github.com/fappels/dolibarr into fappels-develop 
Conflicts:
	htdocs/langs/en_US/sendings.lang
 2015-04-18 20:29:25 +02:00
Laurent Destailleur
b3fc8d2940 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 
Conflicts:
	htdocs/langs/en_US/products.lang
 2015-04-18 20:27:50 +02:00
Laurent Destailleur
8140e33178 git push origin developMerge branch 'Diciannove-langtool' into develop 2015-04-18 20:26:31 +02:00
Laurent Destailleur
fcbb4a5328 Merge branch 'langtool' of https://github.com/Diciannove/dolibarr into Diciannove-langtool 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/langs/en_US/orders.lang
	htdocs/langs/en_US/stocks.lang
 2015-04-18 20:26:23 +02:00
Laurent Destailleur
f7b2b00ebd Merge pull request #2650 from FHenry/dev_pdfpropalmergeproductpdf 
NEW : Propal merge PDF product attached files (on option)
 2015-04-18 20:18:57 +02:00
Laurent Destailleur
cb0e45d54b Merge pull request #2647 from aternatik/fix_css 
Fix : css properties for lists and input fields
 2015-04-18 20:05:10 +02:00
Laurent Destailleur
6e136616c6 Merge pull request #2649 from atm-maxime/develop 
Alert when oustanding amount excedeed
 2015-04-18 20:04:25 +02:00
Laurent Destailleur
6b934001e9 Merge pull request #2651 from aternatik/fix_email_template 
Fix : bad usage of empty function with GETPOST
 2015-04-18 20:03:55 +02:00
Maxime Kohlhaas
ecf1fbe5a7 Typo 2015-04-18 20:03:40 +02:00
jfefe
bee5af4d9e Fix : bad usage of empty function with GETPOST 2015-04-18 19:56:36 +02:00
Maxime Kohlhaas
c3bcda74f3 Fix : unit price without tax is now subprice (not pu_ht) 2015-04-18 19:17:05 +02:00
Florian HENRY
62ef9743ea Merge branch 'develop' into dev_pdfpropalmergeproductpdf 2015-04-18 19:16:33 +02:00
Juanjo Menent
c5d8fa4602 Fix: solves #2644 2015-04-18 19:14:30 +02:00
Florian HENRY
e704e03726 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-18 19:13:56 +02:00
Maxime Kohlhaas
2ddef9ffd9 Alert when oustanding amount excedeed 2015-04-18 19:08:44 +02:00
Maxime Kohlhaas
53469c803a Typo 2015-04-18 19:08:01 +02:00
jfefe
4f0829d4ea Adjust CSS : missing color for input, textarea and select list 2015-04-18 19:01:33 +02:00
Laurent Destailleur
e4656ecfd4 Merge pull request #2636 from defrance69/patch-59 
NEW Add list of orders into commercial page
 2015-04-18 18:58:06 +02:00
jfefe
c5b191d590 Adjust CSS properties for tables 2015-04-18 18:57:13 +02:00
Francis Appels
c5599efe62 Don't show 'undifined' when no max delivery time 2015-04-18 18:56:25 +02:00
Francis Appels
308ee40134 Fix Lang part2 
Fix lang in en_us
 2015-04-18 18:53:25 +02:00
Laurent Destailleur
07bf403354 Merge pull request #2645 from atm-maxime/develop 
Fix : outstanding limit was not saved
 2015-04-18 18:49:53 +02:00
Maxime Kohlhaas
8e4771daa0 Fix : outstanding limit was not saved 2015-04-18 18:48:50 +02:00
Laurent Destailleur
e1403b136c Merge pull request #2639 from aternatik/stable_resource 
New : mark resource module as stable
 2015-04-18 18:48:24 +02:00
Florian HENRY
db2acb7ced Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-18 18:47:19 +02:00
Laurent Destailleur
97fe909278 Merge pull request #2642 from GPCsolutions/editorconfig 
Dolibarr uses tab indents
 2015-04-18 18:46:46 +02:00
Laurent Destailleur
3edfbf1a67 Merge pull request #2637 from grandoc/develop 
fix syntax errors
 2015-04-18 18:46:19 +02:00
Florian HENRY
e15d4c045d NEW : Propal merge product card PDF into azur 2015-04-18 18:44:05 +02:00