Commit Graph

2815 Commits

Author SHA1 Message Date
Laurent Destailleur
fdf787fca4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-03 09:45:44 +02:00
Laurent Destailleur
ac5cb23c04 Fix: Parameters at wrong place. 2012-09-03 09:45:26 +02:00
Regis Houssin
afdab32bbf Fix: avoid warnings (strict mode) 2012-09-02 22:12:56 +02:00
Laurent Destailleur
c2dc2ba115 Fix: percentage during creation 2012-09-02 14:26:40 +02:00
Laurent Destailleur
b891975b7d Fix: edit of percentage 2012-09-02 14:10:51 +02:00
Grand Philippe
56a620bc88 fix: wrong link 2012-08-31 19:07:47 +02:00
Regis Houssin
f81b696890 Fix: code optimization 2012-08-31 09:25:27 +02:00
Regis Houssin
18b7549c52 Fix: use GETPOST('usenewaddlineform') instead MAIN_FEATURES_LEVEL 2012-08-31 08:51:08 +02:00
Regis Houssin
4054e5a8bd Merge pull request #364 from marcosgdf/minor
Fixed a problem when adding line into proposal
2012-08-30 23:36:36 -07:00
Marcos García
bb99e4d40d Fixed a problem when adding line into proposal 2012-08-31 07:49:00 +02:00
Marcos García
4209898d20 Lower-cased Header function 2012-08-31 05:58:38 +02:00
Regis Houssin
327e51ccd9 Fix: more simple 2012-08-29 17:40:13 +02:00
Laurent Destailleur
2a800816d9 Merge pull request #356 from cbattarel/develop
modify margin management for global discount + correct bug (wrong consta...
2012-08-28 09:24:06 -07:00
Regis Houssin
62a7847c5b Fix: [ task #498 ] debug 2012-08-28 15:35:32 +02:00
Regis Houssin
ce9a16b341 Fix: button add not disabled 2012-08-28 14:42:46 +02:00
Christophe Battarel
c1859d361a modify margin management for global discount + correct bug (wrong constant name) 2012-08-28 10:13:58 +02:00
Regis Houssin
3e2be54ead Fix: restore old method 2012-08-27 19:11:44 +02:00
Laurent Destailleur
35a0311d28 Fix: Checkstyle 2012-08-26 23:15:26 +02:00
Laurent Destailleur
0b42251dfd Checkstyle 2012-08-26 23:13:18 +02:00
Laurent Destailleur
7db8c8aab9 Fix: Regression 2012-08-26 14:14:27 +02:00
Regis Houssin
becda06fd6 Fix: security 2012-08-25 19:40:08 +02:00
Regis Houssin
40be4287cf Fix: remove old code 2012-08-25 19:29:26 +02:00
Regis Houssin
e402c9cd28 Fix: use propal instead propale 2012-08-25 19:25:06 +02:00
Regis Houssin
dcfc34e64e Fix: more better of better 2012-08-25 19:20:17 +02:00
Regis Houssin
4dd8119a9e Fix: use better method for avoid warnings 2012-08-25 19:08:06 +02:00
Regis Houssin
f322ec50ed New: [ task #498 ] - final part 2012-08-25 15:21:34 +02:00
Regis Houssin
c9113458d9 New: [ task #498 ] part 3 2012-08-25 03:28:30 +02:00
Regis Houssin
6a60551fdd Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into task498_objectline

Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-08-23 17:19:05 +02:00
Regis Houssin
995c7f13d3 New: [ task #498 ] part3 2012-08-23 13:45:51 +02:00
Regis Houssin
4d1555f4ca Merge pull request #338 from atm-maxime/mko515
Mko515
2012-08-23 00:01:05 -07:00
Maxime Kohlhaas
332ee652c3 Clear action was called with a rowid instead of id (rowid is for a target of the emailing, id is for the emailing) 2012-08-23 08:45:45 +02:00
Regis Houssin
f4d75e87d3 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into task498_objectline

Conflicts:
	htdocs/core/class/commonobject.class.php
2012-08-23 07:53:48 +02:00
Regis Houssin
c8e1aca7d8 New: [ task #498] part2 2012-08-23 07:50:20 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
ea119c45a2 Lower-cased all <?PHP 2012-08-22 23:27:53 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Regis Houssin
2ae1d3d3b5 New: [ task #498 ] 2012-08-22 17:42:40 +02:00
Regis Houssin
545cb023ff Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into task498_objectline 2012-08-21 13:48:52 +02:00
Laurent Destailleur
2ab1a018df Fix: GETPOST can not always be used to replace isset. 2012-08-20 14:30:16 +02:00
Laurent Destailleur
880276f047 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-08-20 14:14:26 +02:00
Laurent Destailleur
fb074daaf1 Fix: The backto use bad url. 2012-08-20 14:14:01 +02:00
Regis Houssin
3c13395d21 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into task498_objectline 2012-08-20 12:10:20 +02:00
Regis Houssin
7c623a9a2e Fix: strict mode bounty 2012-08-20 11:04:56 +02:00
Regis Houssin
5dc10cfcae Fix: possibility to defined another value instead 50% 2012-08-20 10:38:48 +02:00
Regis Houssin
257dcb8928 Merge pull request #332 from marcosgdf/minor
Fixed incorrect HTML
2012-08-19 22:47:48 -07:00
Marcos García
63c4cfb609 Fixed incorrect HTML 2012-08-20 02:45:38 +02:00
Regis Houssin
b4e324a515 Fix: add ht and ttc fields 2012-08-18 19:05:59 +02:00
Regis Houssin
09e34068bc Merge pull request #319 from marcosgdf/translations
A lot of improvements into translations
2012-08-17 22:22:56 -07:00
Regis Houssin
b3d09478ca Merge pull request #313 from lrq3000/develophooks
A lot of hooks and triggers implemented + custom substitution function for lines in ODT
2012-08-16 08:15:19 -07:00