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

47059 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maxime Kohlhaas
ee8b5be43b Typo 2015-04-19 00:46:30 +02:00
Maxime Kohlhaas
0112cbaaf0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2015-04-19 00:28:15 +02:00
Laurent Destailleur
2f853a56af Merge pull request #2664 from aternatik/img_title 
Picto war!
 2015-04-19 00:27:06 +02:00
jfefe
57d04c601f Add title picto for project section 2015-04-18 23:39:04 +02:00
jfefe
73ef3d73c2 Change size of generic title picto 2015-04-18 23:28:20 +02:00
jfefe
23e5bc4f53 Add title image for bank section 2015-04-18 23:17:47 +02:00
jfefe
22c3406498 Change title images for accountancy section 2015-04-18 23:17:47 +02:00
jfefe
25812f0071 Add picto for commercial pages titles 2015-04-18 23:17:44 +02:00
jfefe
3825b89ead Change companies and product title picto 2015-04-18 23:13:48 +02:00
jfefe
c905f88498 Change generic and setup image title 2015-04-18 23:13:48 +02:00
Maxime Kohlhaas
098f2ab0b1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2015-04-18 23:09:24 +02:00
Maxime Kohlhaas
bcf9e7fb37 Fix : use getentity for stock sharing 2015-04-18 23:08:21 +02:00
Laurent Destailleur
5c80d46b74 Merge pull request #2663 from FHenry/develop 
fix bug #2652
 2015-04-18 23:06:19 +02:00
Florian HENRY
11e1d0310c typo 2015-04-18 23:00:22 +02:00
Florian HENRY
f2018b7946 fix bug #2652 2015-04-18 22:59:20 +02:00
Juanjo Menent
065711df3b Merge pull request #2662 from marcosgdf/fk_soc 
Fixed problem with u.fk_soc in PR #2654
 2015-04-18 22:52:29 +02:00
Marcos García de La Fuente
2a8cf5f8be Fixed problem with last PR #2654 2015-04-18 22:50:40 +02:00
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