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

3270 Commits

Author SHA1 Message Date
Laurent Destailleur
6046feda11 Restore border into PDF 2012-10-11 09:42:47 +02:00
Regis Houssin
10bd942328 Fix: customer ref is very important for a best traceability 2012-10-10 12:04:08 +02:00
Laurent Destailleur
8b4886073c Fix: Removed the FIXME. This is supported by the pgsql driver. 2012-10-09 12:03:39 +02:00
Regis Houssin
044ec61aba Merge pull request #446 from atm-maxime/develop 
Task # 186 : Forgot to add the new box in the mod definition...
 2012-10-08 23:50:49 -07:00
Maxime Kohlhaas
67dbae4486 Correction for new box inclusion 2012-10-09 00:58:07 +02:00
Maxime Kohlhaas
229005b1a9 Task # 186 : Forgot to add the new box in the mod definition... 2012-10-09 00:54:02 +02:00
Maxime Kohlhaas
d343b76f91 Bug # 543 and # 570 : contact address is now used in recipient block and no more display bug on customer order ref until 36 digits 2012-10-09 00:28:52 +02:00
Regis Houssin
478449da37 Fix: convert line delimiters 2012-10-08 20:47:10 +02:00
Regis Houssin
0975918cc6 Fix: [task #146] Remove table llx_categorie_association 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-10-08 19:27:02 +02:00
Christophe Battarel
04be578863 fix wrong last update in cleansep function 2012-10-08 11:32:28 +02:00
Laurent Destailleur
215d7a883e Fix: Revert bugged new feature that show false information. 2012-10-06 23:13:46 +02:00
Laurent Destailleur
6873e93b7f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-05 19:40:09 +02:00
Laurent Destailleur
34f2402cb5 Qual: Removed dead code 2012-10-05 19:39:53 +02:00
Maxime Kohlhaas
85c03faec7 Merge branch 'mko186' into develop 
Conflicts:
	htdocs/langs/en_US/orders.lang
	htdocs/langs/fr_FR/orders.lang
 2012-10-05 08:30:09 +02:00
simnandez
f873198442 Fix: Warning into perms page 2012-10-04 18:40:05 +02:00
simnandez
caef97dc08 Task # 104: Check if module invoice is active and user has creation 
permissions. Move creation invoice to action bar into customer card
 2012-10-04 18:23:21 +02:00
Maxime Kohlhaas
16f82216bf Task # 186 : Add stock column in sql request to get object lines + display alert icon if stock is too low 2012-10-04 16:26:33 +02:00
Laurent Destailleur
5c6b0c064e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-10-04 15:43:28 +02:00
Laurent Destailleur
9ba100a84b New: Support removing tab into member module 2012-10-04 15:37:10 +02:00
Maxime Kohlhaas
0e17c7c063 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko186 2012-10-04 15:36:47 +02:00
Laurent Destailleur
bdb7becbc6 Fix: Try another fix on getTrad bug. 2012-10-04 09:44:04 +02:00
Laurent Destailleur
4b27a9215b Fix: Show message only when needed 2012-10-03 23:15:57 +02:00
Laurent Destailleur
59a33db53d Fix: Add warning to ask refresh. 2012-10-03 20:10:29 +02:00
Laurent Destailleur
2159848490 Fix: getTradFromKey 2012-10-03 17:47:53 +02:00
Laurent Destailleur
2617fc21a6 Some fix: List of invoices to show in "to bill" menu must contains 
"Validated, Shipment in process, Delivered" (some users may want to
make invoice before shipment, some after).
We keep workflow opened by default. Module workflow may restrict this
however.
Also, remove menu entry, because we now have direct link to page onto
list.
 2012-10-03 11:43:39 +02:00
simnandez
921795e562 Task # 104 : Remove MAIN_FEATURES_LEVEL 2012-10-03 09:16:27 +02:00
Regis Houssin
fc1cc95d08 Fix: bad path 2012-10-03 08:54:21 +02:00
Laurent Destailleur
c25e908b75 Doxygen 2012-10-03 00:30:50 +02:00
Maxime Kohlhaas
89e14043a1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko186 2012-10-02 11:01:21 +02:00
Spangaro Alexandre
3ae6117e16 Reintegrate accounting.php in admin 2012-10-02 06:07:57 +02:00
Spangaro Alexandre
3e4fd761a5 Add function to choose chart of accounts 2012-10-02 05:45:49 +02:00
Laurent Destailleur
082ee53dae Fix: Miscellaneous fix in supplier product input 2012-10-02 00:30:23 +02:00
Laurent Destailleur
eec2a7b34e Merge pull request #429 from atm-maxime/mko559 
Task # 559 : add discount on supplier prices
 2012-10-01 13:31:17 -07:00
Maxime Kohlhaas
1aa3156958 Task # 186 : new box of products with stock alert 2012-10-01 16:44:38 +02:00
Maxime Kohlhaas
ed2a140046 Task # 559 : add display of discount in product list while adding line on supplier order 2012-10-01 11:45:28 +02:00
Regis Houssin
bcf46d00f0 Fix: convert line delimiters !! 2012-09-30 21:26:58 +02:00
Regis Houssin
d23188c64a Fix: doxygen 2012-09-30 20:49:13 +02:00
Laurent Destailleur
9db72fb50d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-09-28 16:11:46 +02:00
Laurent Destailleur
e7203fa4f3 New: The discount on line for supplier invoices is now supported 2012-09-28 16:08:44 +02:00
Christophe Battarel
15d7266abf import : add csv options (separator and enclosure) 2012-09-28 10:23:04 +02:00
Laurent Destailleur
6c769cfaf3 Fix: postgresql compatibility 
Qual: Removed deprecated code
 2012-09-27 23:54:47 +02:00
Laurent Destailleur
e94ddde91d Fix: Patch calculation field odt 2012-09-27 21:08:32 +02:00
Laurent Destailleur
a98de7ef02 Fix: No error when hour not provided 2012-09-27 13:25:31 +02:00
Regis Houssin
1919604089 Fix: more compatible with multicompany transverse mode 
Fix: strict mode bubbles
 2012-09-27 11:57:46 +02:00
Laurent Destailleur
051b93c73b Qual: Code cleaner using field name instead of index number. 
New: Can use new syntax to define parent of a menu
(fk_mainmenu=&fk_leftmenu=)
 2012-09-27 00:05:13 +02:00
Regis Houssin
e9de123036 Fix: hide menu if empty 2012-09-26 12:09:14 +02:00
Regis Houssin
d08e66b0b8 Fix: add member module compatibility 2012-09-26 10:43:15 +02:00
Regis Houssin
817e653519 Fix: add todo for free tag treatment 2012-09-25 18:31:08 +02:00
Christophe Battarel
67333522b0 add ability to remove a product tab if it's defined in a module description 2012-09-25 14:42:58 +02:00
Laurent Destailleur
043e5edc2c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-24 21:37:36 +02:00
Laurent Destailleur
7d83fdce5b Fix: Several fixes into date functions 
Qual: Add PHPUnit tests
 2012-09-24 21:37:19 +02:00
Regis Houssin
9792d5a289 Fix: use company name if firstname and lastname not exists 2012-09-24 12:12:37 +02:00
Regis Houssin
c268a62cab Fix: try to disable 1900 test 2012-09-24 09:30:37 +02:00
Laurent Destailleur
a6b2eab439 Revert bad fix. 
Unit tests are back ok (when tag is @6 or @=, yearoffset
is not zero but must not be applied when replacing yyyy). 
Compatibility with 3.2 is also restored.
 2012-09-23 22:09:54 +02:00
Laurent Destailleur
0741b907ee Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-23 22:03:08 +02:00
Laurent Destailleur
0c1651dbf3 Doxygen 2012-09-23 22:02:44 +02:00
Regis Houssin
d147c360d3 FIXME: this code is useless, $yearoffset is 0 by default 2012-09-23 17:05:08 +02:00
Laurent Destailleur
7fac6b65f6 Fix: Fix for compatibility with previous version and for case "@=". 
Qual: Add a lot of phpunit tests to validate all get_next_value()
cases.
 2012-09-23 16:25:08 +02:00
Laurent Destailleur
9bbe0e6b1c Qual: Mutuamize codeby using tpl. 
New: Support unique field for extrafields
 2012-09-22 20:27:06 +02:00
Regis Houssin
e721c6e723 Fix: more simple too 2012-09-22 10:40:12 +02:00
Regis Houssin
1e3cecf25c Fix: can use {yy}{mm} or {mm}{yy} 2012-09-22 10:33:25 +02:00
Regis Houssin
6151bc3a42 Fix: more simple 2012-09-22 09:18:36 +02:00
Regis Houssin
eee4434850 Fix: update doc 2012-09-22 09:03:38 +02:00
Regis Houssin
d48f494eb0 Fix: check fiscal date and new year 2012-09-22 08:53:10 +02:00
Regis Houssin
ba1b282c3b Fix: remove unused code 2012-09-21 11:28:28 +02:00
Regis Houssin
50b0dcf47e New: try to use new tag 2012-09-21 11:23:31 +02:00
Laurent Destailleur
5e9cd37107 Uniformise look of PHP Info page. 2012-09-21 00:13:20 +02:00
Laurent Destailleur
408a4553ee Help center at end (because we leave software) 2012-09-20 22:54:05 +02:00
Laurent Destailleur
05e20b8f30 New: Can exclude some type of events 2012-09-20 00:42:51 +02:00
Regis Houssin
d58c106f66 Fix: convert line delimiters !!! 2012-09-19 17:53:09 +02:00
Regis Houssin
98b38628c5 Fix: optimizing 2012-09-19 17:24:40 +02:00
Laurent Destailleur
cd3d01127c Merge pull request #404 from grandoc/develop 
fix: Warning : Invalid argument supplied for foreach()
 2012-09-19 07:40:43 -07:00
Laurent Destailleur
8b7342f0ea New: Project notes use the note.tpl templates 2012-09-19 16:03:17 +02:00
Grand Philippe
aa7cd880c0 fix: Warning : Invalid argument supplied for foreach() 2012-09-19 15:07:06 +02:00
Laurent Destailleur
533e285dad Merge pull request #403 from simnandez/develop 
Trad: Add ca_ES and es_ES translations
 2012-09-19 05:53:43 -07:00
Laurent Destailleur
9bc0011290 Merge pull request #405 from cbattarel/develop 
correct some ajax bugs caused by tpl recent updates
 2012-09-19 05:53:29 -07:00
Laurent Destailleur
a68483d72f Uniformize code. 2012-09-19 14:49:13 +02:00
Laurent Destailleur
0e76bd7ac6 Fix: Blank page when renaming a product ref 2012-09-19 14:11:01 +02:00
Laurent Destailleur
d1cfe2ec54 Fix: Bug when metafile is on 2012-09-19 13:30:59 +02:00
Laurent Destailleur
1347ecf14e Qual: Removed warnings 2012-09-19 12:49:58 +02:00
Christophe Battarel
de93c819f4 correct some ajax bugs caused by tpl recent updates 2012-09-19 12:02:06 +02:00
Laurent Destailleur
60fc0f2b74 Removed warning 2012-09-19 11:56:50 +02:00
Grand Philippe
2bcbd7dc2a fix: Warning : Invalid argument supplied for foreach() 2012-09-18 18:00:05 +02:00
simnandez
dd9d3c8ba4 Fix: localtaxes must display in pdf even if they are in negative 2012-09-18 17:57:52 +02:00
simnandez
76f3fb56ea Fix: Add type of product/service into propals for a correct localtaxes 
calculation
Fix: Localtax2_type for Spain must be 3
 2012-09-18 16:06:45 +02:00
Laurent Destailleur
889f71db6f Fix: Color of lines must be set for each lines 2012-09-18 12:52:54 +02:00
Laurent Destailleur
4065b52441 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-17 22:05:36 +02:00
Laurent Destailleur
4a98c08a74 Fix: Use correct date timezone. 2012-09-17 22:05:13 +02:00
Regis Houssin
8bab5fdadd Fix: convert line delimiters 2012-09-17 19:37:02 +02:00
Regis Houssin
58ae3b9372 Fix: possibility to disable hook 2012-09-17 19:36:43 +02:00
Regis Houssin
dc7100677a Fix: avoid warning if no object 2012-09-17 16:28:37 +02:00
Laurent Destailleur
ef4831d119 Solved FIXME. I keep the code but commented, to keep source the more 
similar as possible than invoices.
 2012-09-17 11:46:50 +02:00
Regis Houssin
16ad953d10 Fix: best practice 2012-09-17 08:13:29 +02:00
Regis Houssin
80eceab230 Fix: restore broken features 2012-09-17 07:15:38 +02:00
Regis Houssin
10b122578e FIXME: $deja_regle not use in proposal? 2012-09-17 06:52:33 +02:00
Regis Houssin
bf008c7640 Fix: optimizing 2012-09-17 06:43:58 +02:00
Laurent Destailleur
cd6a8fa761 New: Uniformize code 2012-09-17 02:07:14 +02:00
Laurent Destailleur
3953be53a7 Qual: Mutualize code 
New: Can use extrafields on contacts/addresses.
 2012-09-17 01:39:30 +02:00
Laurent Destailleur
2170801fd2 New: Uniformize pdf generation code. We also keep space to repeat pdf 
head info.
 2012-09-17 00:43:23 +02:00
Laurent Destailleur
07fa800360 Fix: Correct concat when mixing not html and html descriptions 2012-09-16 20:23:57 +02:00
Laurent Destailleur
df3227ef7e Migrate spain to localtax type. 2012-09-16 16:56:24 +02:00
Laurent Destailleur
b724a78cb3 Fix: Debug dictionnary to add localtaxes 2012-09-16 15:04:55 +02:00
Laurent Destailleur
d48f294531 New: [ task #289 ] Reorder tasks 2012-09-15 15:33:00 +02:00
Laurent Destailleur
9147911ae4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2012-09-15 13:53:19 +02:00
Laurent Destailleur
4566595d44 Fix: W3C when module margin is on 2012-09-15 13:44:40 +02:00
Regis Houssin
43c0a03758 Fix: strict mode tornado 2012-09-15 11:21:22 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Regis Houssin
be13602c71 Fix: use getDocumentsLink method 2012-09-15 09:02:20 +02:00
Regis Houssin
4220229573 Fix: minor change 2012-09-14 15:56:50 +02:00
Laurent Destailleur
e7d3d9496c first step for extrafield for contact/address 2012-09-14 12:15:55 +02:00
Regis Houssin
968380ba3e Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-13 18:50:29 +02:00
Laurent Destailleur
46ee00fc5e A party to fish bugs and merou. 2012-09-13 18:28:03 +02:00
Regis Houssin
f902fedbb8 Fix: split for more possibility 2012-09-13 17:43:24 +02:00
Laurent Destailleur
af5507bcfa Fix: restore correct behaviour. Space is output only if there is an img 
+ text. img alone is not enough.
 2012-09-13 16:13:12 +02:00
Regis Houssin
7eef637776 Fix: strict mode killer 2012-09-13 11:52:50 +02:00
Laurent Destailleur
ed61508b3f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-13 10:14:47 +02:00
Laurent Destailleur
4cc56f0176 New: Extra fields supports more types (now int, string, double, date, 
datetime)
 2012-09-13 10:14:25 +02:00
Regis Houssin
6561694658 Fix: invert space 2012-09-13 10:03:58 +02:00
Regis Houssin
1fa84aa92b Fix: better 2012-09-13 10:02:45 +02:00
Regis Houssin
9130dbda4e Fix: wrong space 2012-09-13 09:57:12 +02:00
Regis Houssin
b1e01b50f5 Fix: use warning icon for limit size of tab 
Fix: optimizing textwithtooltip method
 2012-09-13 09:52:03 +02:00
Laurent Destailleur
d5e8037483 Merge pull request #395 from marcosgdf/translations 
Improved translations
 2012-09-12 11:08:55 -07:00
Regis Houssin
5770245805 Fix: rename the hook 2012-09-12 19:37:37 +02:00
Marcos García
cb4044755b Fixed export translations 
Added missing strings
Corrected some translations
 2012-09-12 19:11:03 +02:00
Regis Houssin
28e5ba6c18 Fix: mini strict mode 2012-09-12 18:47:06 +02:00
simnandez
2e37084c55 Fix: If price is 'TTC' we need to have the totals without VAT for a 
correct
calculation
Fix: The updateline of propal must include the localtaxes totals
 2012-09-12 17:48:45 +02:00
Laurent Destailleur
dd66ebd3f6 New: Use GB address format 2012-09-12 17:39:02 +02:00
Laurent Destailleur
040dd09f5d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-12 17:25:01 +02:00
Regis Houssin
b78b0830d1 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-12 14:56:23 +02:00
Regis Houssin
664ceb7f2c Fix: This is a 'superglobal', there is no need to do 'global $variable;' 
to access it within functions or methods.
 2012-09-12 14:55:39 +02:00
Laurent Destailleur
c9678e3f1d Merge pull request #391 from marcosgdf/minor 
Fixed xinputuser emailing module
 2012-09-12 05:53:12 -07:00
Regis Houssin
a2f1107bfc Fix: add GET in hook parameters 2012-09-12 14:49:36 +02:00
Marcos García
98092b952d Fixed xinputuser emailing module 
Lastname wasn't being recorded
 2012-09-12 14:49:02 +02:00
Laurent Destailleur
ce1b759c47 Merge pull request #390 from cbattarel/develop 
use selected value in contact type list + remove duplicate print statement
 2012-09-12 04:18:32 -07:00
Laurent Destailleur
71c25bb939 Hide not frequently used third level menus entries. 2012-09-12 13:01:20 +02:00
Christophe Battarel
8111909340 use selected value in contact type list + remove duplicate print statement 2012-09-12 12:55:45 +02:00
Regis Houssin
7358223c8f Fix: convert line delimiters 2012-09-12 12:41:44 +02:00
Regis Houssin
b75efdcf10 Fix: regression, replace triggers by hooks 2012-09-12 12:27:11 +02:00
Laurent Destailleur
8fd384373a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-12 10:57:09 +02:00
Regis Houssin
2557320f8d Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-12 10:47:17 +02:00
Regis Houssin
71d5191ff7 Fix: duplicate parameters 2012-09-12 10:46:35 +02:00
Stephen L
8fcf20227a Fix: definition of all substitution functions is no more required 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-09-11 20:15:03 +02:00
Laurent Destailleur
54be534506 Add comment and renamed file to be sure new function is not called 
directly. Not sure it's a good idea to have dolDeleteFile separated
since it must be called only by dol_delete_file.
 2012-09-11 20:06:37 +02:00
Regis Houssin
b39c9c514a Fix: split into 2 functions 2012-09-11 18:52:23 +02:00
Regis Houssin
3e033ef48c Fix: doc 2012-09-11 17:09:43 +02:00
Regis Houssin
1d6645c5c4 Fix: rename this method 2012-09-11 17:08:29 +02:00
Regis Houssin
f95d611f12 New: add hooks in dol_delete_file and list_of_documents methods 2012-09-11 17:08:10 +02:00
Laurent Destailleur
a249061017 Fix: If object already loaded, the url was not returned. 2012-09-11 15:49:46 +02:00
Regis Houssin
97fffe7b62 Merge pull request #387 from marcosgdf/minor 
Search thirds from barcode directly from the mini search box
 2012-09-11 06:34:32 -07:00
Marcos García
85064abdad Search thirds from barcode directly from the mini search box 
Also added a check when generating barcode image
 2012-09-11 14:27:41 +02:00
Laurent Destailleur
1c91027a4e Fix: Uniformize pdf code. Try to solve offset when a product line is 
moved onto next page.
 2012-09-11 14:03:16 +02:00
Regis Houssin
7712b1c25f Merge pull request #385 from marcosgdf/translations 
Improved translations
 2012-09-10 20:30:25 -07:00
Laurent Destailleur
12b42ab1b4 Doc 2012-09-11 01:53:15 +02:00
Laurent Destailleur
ef00d592e7 Fix: Backward compatibility with spain. 2012-09-11 01:42:50 +02:00
Laurent Destailleur
e68f861923 New: Add more test and enhancement to make new calcul_price function 
more reliable. We need to add more PHPUnit test case on this function
(testcase using localtax1 and localtax2).
 2012-09-11 01:09:34 +02:00
Marcos García
f2393f08bc Translated paper formats and size units in PDF admin page 2012-09-11 00:36:49 +02:00
Laurent Destailleur
b6239427f6 Merge pull request #382 from cbattarel/localtax 
calculate prices with generic local taxes management
 2012-09-10 14:36:44 -07:00
Marcos García
62b7ba607d Better practice 
Replaced `empty($conf->global->MAIN_MODULE_BARCODE)` with `empty($conf->barcode->enabled)`
 2012-09-10 23:23:25 +02:00
Marcos García
61e2596e4d Task #539 - Add new products into proposals,invoices... with barcode 2012-09-10 22:55:12 +02:00
Christophe Battarel
c6da5b79fe change localtaxes parameters to be compatible with older calls 2012-09-10 16:49:36 +02:00
Christophe Battarel
8c11da1df8 readapt to 3.3 2012-09-10 16:01:20 +02:00
Christophe Battarel
4cca760feb calculate prices with generic local taxes management 2012-09-10 15:47:33 +02:00
Regis Houssin
ba2f986282 Fix: [ bug #537 ] Fatal error: Using $this when not in object context 2012-09-10 14:40:32 +02:00
Regis Houssin
6162d296ce Fix: strict mode cowboy 2012-09-10 14:30:33 +02:00
Regis Houssin
d7f3deffce Fix: convert line delimiters 2012-09-09 16:32:03 +02:00
Regis Houssin
9058439015 Fix: best practice 2012-09-09 16:17:19 +02:00
Laurent Destailleur
83cdb2167e Fix: Use bad parameter name 2012-09-09 15:23:09 +02:00
Laurent Destailleur
fcce22026a Fix: Bad name of var 2012-09-09 15:09:54 +02:00
Laurent Destailleur
e0624abb2c Added option THEME_ELDY_USE_HOVER to enable mouse hover, because when 
using software a lot, it becomes annoying. So we let user choose
(choice possible only with eldy theme for the moment).
 2012-09-09 14:49:20 +02:00
Laurent Destailleur
a551fa982e Comments 2012-09-08 21:29:03 +02:00
Regis Houssin
d2e336ddd6 Fix: GET and POST treatment in dol_loginfunction() 2012-09-08 15:16:27 +02:00
Laurent Destailleur
5641a451d5 Revert "Fix: GETPOST is already in method" 
This reverts commit ce26a3cc81.
 2012-09-08 13:33:48 +02:00
Regis Houssin
ce26a3cc81 Fix: GETPOST is already in method 2012-09-08 13:24:10 +02:00
Laurent Destailleur
00ceaf9fac Sec: XSS hole 2012-09-08 13:19:54 +02:00
Laurent Destailleur
a7fdbcbddc Update auguria module 2012-09-08 02:03:47 +02:00
Laurent Destailleur
d0528740c2 Fix: We must not show date range for a product line type (only 
service line)
 2012-09-08 01:02:54 +02:00
Laurent Destailleur
7c27cfa88e Fix: br at wrong place (a different fix that should be ok in all cases) 2012-09-08 00:58:14 +02:00
Laurent Destailleur
1280499110 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-08 00:52:59 +02:00
Laurent Destailleur
265ef489a6 Merge menu "System info" with "System tools" 2012-09-08 00:52:44 +02:00
Regis Houssin
c98e456ba9 Fix: missing <br> and strict mode 2012-09-07 18:16:05 +02:00
Regis Houssin
ee1cf819f7 Fix: mass convert line delimiters 2012-09-07 17:23:16 +02:00
Regis Houssin
5270ec06cb Fix: compatibility with multicompany transverse mode 2012-09-07 17:20:12 +02:00
Regis Houssin
928aae7f79 Fix: strict mode day 2012-09-07 11:40:59 +02:00
Regis Houssin
b6dc20fb90 Fix: send $varfiles instead _FILES 2012-09-07 10:58:29 +02:00
Regis Houssin
e725ef0eef Fix: find $upload_dir in first part of $dest_file 2012-09-07 10:54:56 +02:00
Laurent Destailleur
0dfc9e59fe New: Creation of meta file works for all elements. Disabled by default. 2012-09-07 10:30:02 +02:00
Laurent Destailleur
eb3a262289 Fix: br at wrong place 2012-09-07 10:03:25 +02:00
Regis Houssin
171f25d3b2 Fix: getDirList is ambiguous, this method can return dir list or files 
list. Method is renamed to "getNodesList"
 2012-09-07 08:47:10 +02:00
Regis Houssin
b6f090eeef Fix: add notrigger parameter 2012-09-07 08:09:07 +02:00
Laurent Destailleur
13d6024a9f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-07 00:15:08 +02:00
Laurent Destailleur
1275a41244 New: Start to work on position of tasks into a project 2012-09-07 00:14:50 +02:00
Laurent Destailleur
28e7b73d21 Enhancement of holiday module 2012-09-06 23:58:09 +02:00
Regis Houssin
83fbaac70d New: add hook in dol_move_uploaded_file method and split function with 
dol_check_uploaded_file method
 2012-09-06 21:30:44 +02:00
Laurent Destailleur
221b671636 New: The signature feature is full ok now. 2012-09-06 19:07:51 +02:00
Regis Houssin
6f8b403c23 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-06 12:41:08 +02:00
Regis Houssin
b5ba6ef4d9 Fix: broken feature, enable source details by default 2012-09-06 12:37:36 +02:00
Regis Houssin
720d0d99b0 Fix: strict mode 2012-09-06 12:36:55 +02:00
Laurent Destailleur
7f3013cd8f Fix: Show box even if order was not yet set 2012-09-06 10:22:33 +02:00
Laurent Destailleur
35c44896e4 Strict mode 2012-09-06 10:22:15 +02:00
Laurent Destailleur
856c829c99 New: Add a selection module for emailing to enter a recipient from 
gui.
 2012-09-05 20:41:28 +02:00
Laurent Destailleur
7059cdb07a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-05 18:33:01 +02:00
Laurent Destailleur
20bca1dd5a Qual: Removed useless page 2012-09-05 18:28:12 +02:00
Regis Houssin
3823e5d374 New: add possibility to add or force default directories 2012-09-05 17:37:58 +02:00
Laurent Destailleur
765fd9341a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-05 14:42:20 +02:00
Laurent Destailleur
d02076f8f2 Strict mode war 2012-09-05 14:41:45 +02:00
Regis Houssin
4f056c707c Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-05 14:33:00 +02:00
Regis Houssin
c18375d7ee Fix: broken features 
$reshook may contain returns stacked by other modules
$reshook is always empty with an array for can not lose returns stacked
with other modules
$hookmanager->resArray may contain array stacked by other modules
 2012-09-05 14:30:12 +02:00
Laurent Destailleur
a3cb0e502e Uniformize code and add comment on localtax to prepare usage for other 
countries.
 2012-09-05 14:05:17 +02:00
Laurent Destailleur
0e1dcb9408 Use a more standard behaviour: If hook return non zero, it is a "replace 
code" hook. Otherwise, it is "insert code" hook.
 2012-09-05 13:05:24 +02:00
Laurent Destailleur
9496fdd20b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-05 13:00:01 +02:00
Laurent Destailleur
84438d82f4 Qual: Clean module 2012-09-05 12:59:33 +02:00
Regis Houssin
86f3c8eb26 Fix: return an array 2012-09-05 12:38:39 +02:00
Regis Houssin
696c7eb454 Fix: use require instead include_once 2012-09-05 11:22:52 +02:00
Laurent Destailleur
b20c8d97c0 Fix: Checkstyle 2012-09-05 11:20:52 +02:00
Regis Houssin
1933bd4b50 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-05 10:17:33 +02:00
Regis Houssin
6bd571b31a New: add hook 'getDirList' in dol_dir_list() method 2012-09-05 10:17:02 +02:00
Laurent Destailleur
cc38fbe33f Uniformize code 2012-09-05 09:58:35 +02:00
Laurent Destailleur
105cb2373c Add comment 2012-09-05 04:13:31 +02:00
Laurent Destailleur
246f3b5bb8 New: Add the holiday module (provided by teclib with permission to add 
it by default).
 2012-09-05 03:26:57 +02:00
Laurent Destailleur
55a5d56ebb Fix: comment 2012-09-04 23:08:57 +02:00
Laurent Destailleur
2f680adbb5 Fix: We must use the shipping address. 2012-09-04 23:03:39 +02:00
Regis Houssin
8a50a391be Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-04 20:47:03 +02:00
Regis Houssin
678e006121 Fix: for test 2012-09-04 20:46:08 +02:00
Laurent Destailleur
95fc429743 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-09-04 20:05:31 +02:00
Laurent Destailleur
aea89389e8 Qual: Uniformize pdf templates 
Qual: Removed duplicate pdf templates when content with no technology
difference nor functionnal difference
 2012-09-04 20:04:38 +02:00
Regis Houssin
58a9dc1afb Fix: syntax error 2012-09-04 19:33:11 +02:00
Regis Houssin
32421ef33c Fix: more simple 2012-09-04 19:25:31 +02:00
Regis Houssin
db9fe97738 New: add "please be patient" message 2012-09-04 19:19:30 +02:00
Regis Houssin
65263886f4 Fix: add distinct for avoid double record 2012-09-04 11:51:51 +02:00
Regis Houssin
795bb1de77 Fix: comaptibility with multicompany and transverse mode 2012-09-04 11:09:17 +02:00
Regis Houssin
7f6bf34362 Try to use blockUI 2012-09-04 09:38:38 +02:00
Regis Houssin
2130571712 New: try jquery blockUI plugin 2012-09-03 22:05:13 +02:00
Regis Houssin
15db85bc86 Fix: prepare external extended ged 2012-09-03 21:00:46 +02:00
Regis Houssin
0797ff3057 Fix: missing concat 2012-09-03 17:25:35 +02:00
Regis Houssin
1abc87f642 Fix: can delete an import file with dialog confirm 2012-09-03 17:14:33 +02:00
Laurent Destailleur
9eb21c3d9f Fix: Minot miscellanous fix 2012-09-03 10:17:58 +02:00
Regis Houssin
d2ae90f938 Fix: strict mode everywhere 2012-09-02 22:48:52 +02:00
Regis Houssin
e36af3085a New: add possibility to have a confirm dialog box with on/off buttons 
Qual: move some functions in lib_head.js
 2012-09-02 22:18:06 +02:00
Regis Houssin
0a88287b50 Fix: strict mode circus 2012-09-02 22:16:57 +02:00
Regis Houssin
7e5971f2d1 Fix: missing conf max_file_size 2012-09-02 22:15:18 +02:00
Regis Houssin
afdab32bbf Fix: avoid warnings (strict mode) 2012-09-02 22:12:56 +02:00
Regis Houssin
a00205a17d New: add possibility to set and del anothers constants 2012-09-02 22:06:03 +02:00
Regis Houssin
0ad137e734 Fix: uniformize code 2012-09-02 22:00:14 +02:00
Laurent Destailleur
2927a58606 Fix: Some fix into ajax ecm. 
New: The cache for nb of files into a dir is now implemented. By
default it is "not defined" and we refresh it when making a scan of a
dir for all subdirs.
 2012-09-02 20:11:36 +02:00
Laurent Destailleur
f369c9d99b New: ECM autodir works also for files joined to products and services 2012-09-02 15:03:55 +02:00
Laurent Destailleur
c68ffdfcae Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-02 14:11:28 +02:00
Laurent Destailleur
1253683b83 Fix: edit of percentage 2012-09-02 14:11:07 +02:00
Regis Houssin
ac5e201829 Fix: compatibility between bureau2crea theme and multicompany module 2012-09-02 11:40:20 +02:00
Regis Houssin
63564f8d50 Fix: broken features 2012-09-02 09:27:06 +02:00
Regis Houssin
c9886fb86d Fix: same size of view lines 2012-08-31 16:50:46 +02:00
Regis Houssin
f81b696890 Fix: code optimization 2012-08-31 09:25:27 +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
Laurent Destailleur
2aa883c25e Better comments 2012-08-31 01:00:18 +02:00
Regis Houssin
9a6ddbe096 Fix: use $mysoc instead customer 2012-08-30 22:14:18 +02:00
Regis Houssin
e84f57e62c Fix: restore broken features 2012-08-30 21:37:37 +02:00
Laurent Destailleur
c7e7b67433 Fix: bad default vat calculation 2012-08-30 21:16:41 +02:00
Laurent Destailleur
cd9a6942ce Revert "Fix: add title" 
This reverts commit f27821a657.
 2012-08-30 20:28:43 +02:00
Regis Houssin
f27821a657 Fix: add title 2012-08-30 19:32:34 +02:00
Regis Houssin
8f21abfc5a Fix: Disabled if customer is not subject to VAT 2012-08-30 19:01:48 +02:00
Regis Houssin
88742e41d4 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-30 11:10:53 +02:00
Regis Houssin
95c2650160 Fix: best method 2012-08-30 11:10:17 +02:00
Laurent Destailleur
bd5acde0c7 Add tag to detect new method (to help debugs) 2012-08-29 19:03:58 +02:00
Laurent Destailleur
edab47fbc8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-29 18:23:49 +02:00
Regis Houssin
ffd6c07003 Fix: remove obsolete code 2012-08-29 18:14:20 +02:00
Regis Houssin
13d46da3fe Fix: clear old data before update 2012-08-29 18:01:00 +02:00
Laurent Destailleur
86a12d7471 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-29 17:43:43 +02:00
Laurent Destailleur
d8d28d6350 New: Add ChromePHP output into syslog module. 2012-08-29 17:43:20 +02:00
Regis Houssin
327e51ccd9 Fix: more simple 2012-08-29 17:40:13 +02:00
Laurent Destailleur
21555f00ef Fix: Bad test 2012-08-29 16:59:36 +02:00
Laurent Destailleur
87742cb3d8 Qual: Move an admin tools into admin menu. 
Fix: Fix 7 bugs into the mass vat update tool.
 2012-08-29 14:13:13 +02:00
Regis Houssin
6bdba9fa72 Fix: get the good vat rates 2012-08-29 11:55:53 +02:00
Regis Houssin
4da73a8d82 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-29 10:08:46 +02:00
Regis Houssin
54860ef304 Fix: upgrade tcpdf and fpdi 2012-08-29 09:55:32 +02:00
Marcos García
89692fb79e Uniformized sql error management 
Eldy told me that this is the correct way to handle SQL errors…
 2012-08-29 08:37:12 +02:00
Regis Houssin
70c467e429 Fix: Update vat rate combobox 2012-08-29 08:17:25 +02:00
Marcos García
7c0463b215 Used incorrect translation keys 
Duplicated keys
 2012-08-29 00:29:47 +02:00
Laurent Destailleur
bd05056616 Fix: Missing br removed from select_produits 2012-08-28 22:25:58 +02:00
Laurent Destailleur
32ca894952 Try a fix for js syntax error 2012-08-28 22:05:40 +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
Laurent Destailleur
4bd6e9e6ad Merge pull request #355 from marcosgdf/cerfafr 
Minor fixes to CerfaFR donation document
 2012-08-28 09:09:29 -07:00
Regis Houssin
c0bde33b1f Fix: [ task #498 ] add same tests in edit mode 2012-08-28 16:11:40 +02:00
Regis Houssin
ce9a16b341 Fix: button add not disabled 2012-08-28 14:42:46 +02:00
Regis Houssin
526f0e310b Fix: convert line delimiters 2012-08-28 12:38:07 +02:00
Regis Houssin
4332c341bf Fix: check if textarea is not empty for free lines 2012-08-28 12:36:35 +02:00
Christophe Battarel
c1859d361a modify margin management for global discount + correct bug (wrong constant name) 2012-08-28 10:13:58 +02:00
Marcos García
c8869e65a6 Minor fixes to CerfaFR donation document 
* Title wasn't localized
* Fixed donation ref
 2012-08-28 09:58:15 +02:00
Regis Houssin
eea7127aa2 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-27 21:45:48 +02:00
Regis Houssin
e55c86074e Fix: compatibility with combobox 2012-08-27 21:45:19 +02:00
Laurent Destailleur
24c29e23f9 Fix: Force reload of index page when all boxes were removed. This is to 
be sure to have the combo list complete after this refresh.
 2012-08-27 21:16:26 +02:00
Laurent Destailleur
857a11f508 New: Can select thirdparties into emailing targets, even if module 
category is not enabled.
 2012-08-27 20:21:53 +02:00
Laurent Destailleur
80d9fb7134 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-27 20:02:42 +02:00
Laurent Destailleur
d0d5891eef New: Add unit foot2, inch2, foot3 and inch3 for surface and volumes. 2012-08-27 20:02:23 +02:00
Regis Houssin
10f9b53557 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-27 19:12:31 +02:00
Regis Houssin
3e2be54ead Fix: restore old method 2012-08-27 19:11:44 +02:00
Laurent Destailleur
29fa8b64c4 Checkstyle 2012-08-27 18:04:00 +02:00
Regis Houssin
7ca0aa8a78 Fix: restore deprecated files 2012-08-27 17:23:35 +02:00
Regis Houssin
07a10d3984 Fix: add compatibility with old static combobox 2012-08-27 17:18:46 +02:00
Laurent Destailleur
426b3c2627 New: Adding a box add it on column with the less boxes. 2012-08-27 14:47:20 +02:00
Laurent Destailleur
b57de4fbac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-27 14:11:58 +02:00
Laurent Destailleur
1255699791 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/tpl/objectline_add.tpl.php
 2012-08-27 14:11:17 +02:00
Regis Houssin
6426ef3f8d Fix: add test for instance 2012-08-27 14:08:59 +02:00
Laurent Destailleur
625f53a708 Fix 4: test on selected value was lenght > 0 but if value is 0, lenght 
is 1 and we want flase here.
Fix 5: Button Add is enabled once a predefined product is selected.
 2012-08-27 13:54:14 +02:00
Regis Houssin
fb866d9106 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_add.tpl.php
 2012-08-27 13:33:31 +02:00
Regis Houssin
2f14fbe791 Fix: debug ckeditor and VAT 2012-08-27 13:27:27 +02:00
Laurent Destailleur
0bdb9aac31 Fix condition of usage of ckeditor 2012-08-27 13:07:25 +02:00
Laurent Destailleur
9570e03b1e Qual: Add TODO 2012-08-27 12:07:50 +02:00
Laurent Destailleur
d8e162c309 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-26 22:36:21 +02:00
Laurent Destailleur
bdaaa1d038 New: [ task #494 ] Send an email to foundation when a new member has 
auto-subscribed
 2012-08-26 22:33:27 +02:00
Regis Houssin
efa471b12b Fix: test if ckeditor is enabled 2012-08-26 21:47:56 +02:00
Laurent Destailleur
b2808f6a60 Doxygen 2012-08-26 20:18:29 +02:00
Laurent Destailleur
56d19437f4 Fix: [ bug #524 ] Donation receipt html_cerfafr is not localized 2012-08-26 18:01:29 +02:00
Laurent Destailleur
1c0303ea6b Fix: Restore broken feature. 2012-08-26 13:44:42 +02:00
Regis Houssin
f322ec50ed New: [ task #498 ] - final part 2012-08-25 15:21:34 +02:00
Regis Houssin
d88abe8df0 Fix: use label instead libelle 2012-08-25 12:07:18 +02:00
Regis Houssin
6fe631378b Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into task498_objectline 2012-08-25 11:28:08 +02:00
Regis Houssin
954f2afbc5 Fix: remove obsolete code 2012-08-25 10:49:59 +02:00
Regis Houssin
c9113458d9 New: [ task #498 ] part 3 2012-08-25 03:28:30 +02:00
Grand Philippe
2d34e7bf8b fix some issue within typhon pdf 2012-08-24 16:34:05 +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
39de1cb010 Task 515 : Correction on SQL request 2012-08-23 08:43:29 +02:00
Marcos García
19bf4ab8df Improvements to translations 
Some available translations weren't being translated
Also corrected wrong translation key
Improved es_ES translation string
 2012-08-23 08:29:38 +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
Regis Houssin
3cdb2ba8e1 Merge pull request #337 from marcosgdf/coding-style 
Improved coding style
 2012-08-22 22:43:03 -07:00
Regis Houssin
08ea9c4351 Merge pull request #334 from grandoc/develop 
Develop
 2012-08-22 22:39:39 -07: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
37c4898720 Removed "./" in require statements 
It does not make any sense to do that
 2012-08-23 01:43:44 +02:00
Maxime Kohlhaas
5fd10d14be Task 515 : Corrections + target modules modifications 2012-08-23 00:00:01 +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
85c0dd95ca 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-22 17:50:07 +02:00
Regis Houssin
4a5d89e6cc Fix: move barcode type entries in module descriptor for best 
compatibility with multicompany
 2012-08-22 17:44:52 +02:00
Regis Houssin
2ae1d3d3b5 New: [ task #498 ] 2012-08-22 17:42:40 +02:00
Philippe Grand
f6e31ee6bc Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2012-08-22 09:04:41 +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
Regis Houssin
75bfddd7a6 Fix: wrong ereg 2012-08-21 11:47:56 +02:00
Philippe Grand
6cfe58f083 fix some english translation 2012-08-21 09:39:07 +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
5dc10cfcae Fix: possibility to defined another value instead 50% 2012-08-20 10:38:48 +02:00
Regis Houssin
c6d008fb1b Fix: broken feature and add FIXME 2012-08-20 09:40:59 +02:00
Regis Houssin
1aa26d0cd7 Fix: missing show field if "in progress" is chosen first 2012-08-20 08:45:39 +02:00
Regis Houssin
8719f87781 Fix: avoid warning "is not a legal ECMA-262 octal constant" 2012-08-20 08:30:55 +02:00
Marcos García
344f379683 jQuerified events' javascript 2012-08-20 02:42:56 +02:00
Laurent Destailleur
9c31e6b2db Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-08-20 02:15:50 +02:00
Laurent Destailleur
218b97f2d0 Fix: [ bug #506 ] Can't set percentage of a started event 2012-08-20 02:15:07 +02:00
Regis Houssin
3991e0b13d Fix: add accountancy code error message 2012-08-20 01:29:13 +02:00
Regis Houssin
a856ad0afa Fix: strict mode sunshine 2012-08-19 09:05:50 +02:00
Regis Houssin
b4e324a515 Fix: add ht and ttc fields 2012-08-18 19:05:59 +02:00
Regis Houssin
bd99c2d23d Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-18 08:31:59 +02:00
Regis Houssin
d03b29ba78 Fix: [ bug #502 ] Error when validating cheque deposit 2012-08-18 08:30:29 +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
577a853b9b New: update field "qty" with minimum qty for this supplier price 2012-08-17 18:17:15 +02:00
Regis Houssin
7394525388 Fix: disable "add" button and show error message if a product with no 
supplier price is selected
 2012-08-17 16:58:57 +02:00
Regis Houssin
3438305169 FIXME: with ajax autocompleter, does not see the products that have no 
supplier prices because they can be selected and it creates an error
message.
Fix: Do not make a "print" on "hook methods", just get the result
 2012-08-17 15:16:07 +02:00
Regis Houssin
e1c009fce4 Fix: regression, formconfirm template can't use with variable content 2012-08-16 17:22:00 +02: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
Marcos García
f320ed92cc Translated and upper-cased export formats, improved es_ES translations 
fr_FR exports translations were made by @fhenry and Manuel Pintor (contact@idl-mp.com)
Little refactor too
 2012-08-16 13:07:12 +02:00
Marcos García
cc4d5ff8d8 Removed the use of duplicated key translations 
Nature is now being used instead of MorPhy
UserTitle is now being used instead of Civility
VATIntraVeryShort was being used were not necessary
 2012-08-15 18:55:32 +02:00
Regis Houssin
48efabc8a4 Fix: remove deprecated function and avoid warnings 2012-08-15 09:06:36 +02:00
Stephen L
c0a314000c Add custom ODT substitution for lines of products (completesubstitutionarray_lines) 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-08-14 16:03:45 +02:00
Stephen L
c1d15a9572 Add: hooks and triggers for a lot of core modules (action/calendrier, deplacement, dons, tva, contact/tiers, contrat, product lines, expedition, fournisseur commandes et factures, fiche intervention, projet et taches) 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-08-14 15:50:45 +02:00
Marcos García
c49e458c6c Propal stats weren't showing average total for more than 1 year 2012-08-14 15:43:14 +02:00
Marcos García
1b817e79b9 Improved some es_ES translations & fixed untranslated string 2012-08-13 06:26:56 +02:00
Maxime Kohlhaas
44b84b2177 task # 326 : Add a numbering module to suggest automatically a product ref 2012-08-09 01:41:55 +02:00
Laurent Destailleur
0d346ac1c1 New: A module can add several css and several js. 
New: Removed lightbox as it is not compatible with GPL.
 2012-08-08 20:43:23 +02:00
Laurent Destailleur
2220c6e964 Fix: Do not run request if param is empty 2012-08-08 14:07:04 +02:00
Laurent Destailleur
85f5033f47 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-08 04:12:48 +02:00
Laurent Destailleur
54c6db5b81 Qual: Uniformize code for pdf generation. 
Refactoring of pdf code to make code cleaner and fix a lot of bug into
page breaks.
 2012-08-08 04:12:20 +02:00
Laurent Destailleur
30444da6b9 Fix: autoselect when it should not 2012-08-07 18:55:55 +02:00
Laurent Destailleur
5ddd982f6e New: If field "signature" is filled into user table, text is added at 
end of predefined email texts. If option MAIL_DO_NOT_USE_SIGN is on,
this feautre is disabled.
 2012-08-07 16:55:14 +02:00
Laurent Destailleur
e47accd87b Qual: Removed deprecated code 2012-08-07 14:13:59 +02:00
Laurent Destailleur
803f840761 Qual: Rename label to avoid confusion. 
Qual: Fix code to reflect documentation.
 2012-08-07 13:12:20 +02:00
Laurent Destailleur
5d9f16ca20 New: More surface control on stock correction page 2012-08-07 11:33:11 +02:00
Laurent Destailleur
49f8f07737 Start to work on bug [ bug #251 ] and [ bug #260 ]. 2012-08-06 19:22:14 +02:00
Laurent Destailleur
cc76ea1f66 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-05 21:14:52 +02:00
Laurent Destailleur
3af27d17ab Add param to force to hide menu from login page 2012-08-05 21:14:17 +02:00
Laurent Destailleur
4d59ecb049 Fix: Missing condition 2012-08-05 21:06:48 +02:00
Regis Houssin
89cd23452f Fix: missing delete shipping and delivery files 
(minimum for possibility to merge with 3.2)
 2012-08-05 20:41:11 +02:00
Regis Houssin
2884aac4bc Fix: delete pdf if supplier invoice is deleted 
Fix: compatibility with external modules

Conflicts:
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
 2012-08-05 18:36:20 +02:00
Regis Houssin
25662f9ecc Fix: compatibility with jquery fileupload 2012-08-05 18:32:59 +02:00
Laurent Destailleur
591b029781 Doxygen 2012-08-05 15:15:58 +02:00
Laurent Destailleur
c247c710ec Qual: Uniformize code 2012-08-05 15:00:24 +02:00
Laurent Destailleur
e53e847083 Qual: Uniformize code 2012-08-05 14:37:45 +02:00
Laurent Destailleur
14bda09369 Removed deprecated not used method 2012-08-05 14:11:28 +02:00
Marcos García
2726283034 Missing BoxGlobalActivity translation and missing es_ES BoxLatestSupplierOrders translation 2012-08-04 14:45:23 +02:00
Regis Houssin
4d3e798f99 Fix: remove test in $pictoisfullpath and add test in $options 2012-08-04 14:18:02 +02:00
Regis Houssin
46511de913 Fix: remove unused code for avoid warning with IE9 2012-08-04 13:49:04 +02:00
Regis Houssin
e955b041ca Fix: just change $path value 2012-08-04 09:56:25 +02:00
Regis Houssin
320ce03e29 Fix: optimization 
see : http://mkaz.com/web-dev/php-benchmarking-isset-empty-or-var.html
 2012-08-04 08:45:38 +02:00
Marcos García
189c3c94da Removed duplicated code 2012-08-04 02:15:39 +02:00
Marcos García
b8add21d93 Reversed lost changes with the previous commit 2012-08-03 23:29:08 +02:00
Regis Houssin
447fc1de1a Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-03 20:10:01 +02:00
Regis Houssin
0d96803937 Fix: strict mode tour 2012-08-03 20:09:37 +02:00
Regis Houssin
65bb19da02 Merge pull request #288 from marcosgdf/style 
Little refactor to img_phone function
 2012-08-03 05:48:25 -07:00
Marcos García
d30b2804bc Was using tabs instead of spaces 2012-08-03 14:31:10 +02:00
Marcos García
f700f63494 Little refactor + cpd 2012-08-03 14:30:11 +02:00
Laurent Destailleur
6cf97a7317 Clean dead code 2012-08-03 14:18:48 +02:00
Laurent Destailleur
30d22378ac Restore img_phone as deprecated function after a patch push. 2012-08-03 13:10:15 +02:00
Laurent Destailleur
f1618bcaa7 Merge pull request #282 from marcosgdf/style 
Refactor
 2012-08-03 03:28:10 -07:00
Laurent Destailleur
233c47ef08 Merge pull request #286 from FHenry/develop 
update select_contact method to add possibility to display contact
 2012-08-02 07:45:50 -07:00
FHenry
799b1727f8 update select_contact method to add possibility to display contact 
compagny also
 2012-08-02 10:12:32 +02:00
Regis Houssin
e0385cf06f Fix: strict mode palace 2012-08-02 10:07:55 +02:00
Regis Houssin
fe4fc7f8dc Fix: increase speed 2012-08-02 08:02:49 +02:00
Regis Houssin
e717f491c1 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-01 19:41:09 +02:00
Regis Houssin
5ad211a1ca Fix: bad document path with multicompany 2012-08-01 19:34:42 +02:00
Laurent Destailleur
07a09cad1d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-01 19:29:58 +02:00
Laurent Destailleur
b35240c899 Fix: Bad url 2012-08-01 19:29:36 +02:00
Regis Houssin
2e73cd7ddf Fix: missing fields and compatibility with milestone 2012-08-01 17:38:10 +02:00
Regis Houssin
d6a4d5ef41 Fix: avoid errors if install directory is deleted before module 
activation
 2012-08-01 14:42:24 +02:00
Regis Houssin
29fea7bbf4 Fix: regression (multicompany) 2012-08-01 13:03:41 +02:00
Marcos García
9d422350a5 Translated some comments 2012-07-31 14:41:15 +02:00
Marcos García
315896c702 Fixed img_up 2012-07-31 01:17:21 +02:00
Marcos García
3520513c6b Fixed an error that I introduced in a previous commit... 2012-07-31 00:53:05 +02:00
Marcos García
571d20d583 Wrong behaviour 2012-07-30 23:27:12 +02:00
Marcos García
2c466159f9 Refactoring 2012-07-30 23:23:58 +02:00
Regis Houssin
97027c7d76 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-30 22:38:46 +02:00
Regis Houssin
66ba264ca3 Fix: strict mode and event message 2012-07-30 22:38:21 +02:00
Marcos García
0e0cf98c4f Code style improved, removed duplicated code, also removed img_phone function as it is no longer used in Dolibarr 2012-07-30 22:36:43 +02:00
Laurent Destailleur
5772e46c9a We start new modules with level "experimental". 2012-07-30 22:18:54 +02:00
Regis Houssin
e44fd4885d Fix: change the last $DB to $db 2012-07-30 18:43:49 +02:00
Marcos García
5a73c32f46 Migrated ClassName to __construct() function 
Changed $DB to $db
lower-cased "Class"
 2012-07-30 17:17:33 +02:00
Marcos García
7e0892783a Removed duplicated translation and modified a line of code as @hregis requested 2012-07-30 08:21:05 +02:00
Marcos García
35f2e731e1 PHP upper-cased + checkstyle 2012-07-29 22:43:54 +02:00
Marcos García
be388b4418 Fixed some typos in es_ES and en_US translations 
Allowed MailmanSPIP module configuration to be translated into other languages
Moved MailmanSPIP-related strings to mailmanspip.lang file
 2012-07-29 22:23:51 +02:00
Laurent Destailleur
d85bd3d41c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-29 18:47:03 +02:00
Laurent Destailleur
77e4b088ac Doc 2012-07-29 18:27:53 +02:00
Regis Houssin
28851b46c4 Fix: remove duplicate code 2012-07-29 16:44:19 +02:00
Regis Houssin
1591a5ac3b Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-29 15:47:40 +02:00
Regis Houssin
0aa6694c95 Fix: broken event message 2012-07-29 15:47:24 +02:00
Laurent Destailleur
e8b2489c1c Checkstyle 2012-07-29 15:28:39 +02:00
Laurent Destailleur
b43c7e1b35 Qual: Removed warning 2012-07-29 14:23:33 +02:00
Laurent Destailleur
d6a5b224fb Revert bad practice: setEvent use SESSION. Such usage is limited to HTML 
page context and can be used inside any pages.
However usage of _SESSION must never be used inside a library (except
for function dedicated to HTML page context), and never inside
object classes (we must use $this->errors, $this->mesgs or
$this->warnings instead).
 2012-07-29 14:15:29 +02:00
Regis Houssin
eee5653c54 Fix: try to use the new message system 2012-07-29 12:54:19 +02:00
Regis Houssin
77a5ef0b22 Fix: move ajax response in ajax directory 2012-07-29 10:24:42 +02:00
Regis Houssin
beedf13324 Fix: restore broken feature, disable token renewal in ajax response 2012-07-29 09:54:58 +02:00
Regis Houssin
9cdba5bb61 Fix: try another method more clean and can be deployed on any type of 
message
 2012-07-29 08:26:33 +02:00
Regis Houssin
cdc9dda11e Fix: best practice 2012-07-28 22:28:33 +02:00
Regis Houssin
a27e347ee0 Fix: for backward compatibility 2012-07-28 22:20:58 +02:00
Regis Houssin
61fc592434 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-28 22:08:05 +02:00
Regis Houssin
c7bacecf10 Fix: try to use another method for messages 2012-07-28 22:07:27 +02:00
Regis Houssin
1816886135 Merge pull request #271 from marcosgdf/translations 
Removed space before colon
 2012-07-28 11:30:25 -07:00
Marcos García
16df86003d Removed space before : 2012-07-28 20:20:56 +02:00
Marcos García
8c68b096fd Removed space before : 2012-07-28 20:16:54 +02:00
Regis Houssin
9a80f0351d New: add phpmailer class 2012-07-28 19:11:05 +02:00
Raphaël Doursenaud
d34c4518d2 Removed BOM from UTF-8 files 
Fix: convert line delimiters (regis)

Conflicts:
	htdocs/core/filemanagerdol/browser/default/js/common.js
	htdocs/core/filemanagerdol/browser/default/js/fckxml.js
 2012-07-28 19:04:50 +02:00
Regis Houssin
251640561f Fix: strict mode happy hour 2012-07-28 12:35:11 +02:00
Regis Houssin
a157327859 Fix: strict mode paradise 2012-07-28 11:28:37 +02:00
Regis Houssin
a3080acab4 Merge pull request #262 from marcosgdf/minor-fixes-develop 
Pull request #254 into develop
 2012-07-28 00:31:51 -07:00
Laurent Destailleur
eb79646315 Fix: restore correct test (empty instead of ! isset) 2012-07-27 23:30:23 +02:00
Marcos García
2204c09e5a Applied commits 16-22 2012-07-27 23:04:05 +02:00
Laurent Destailleur
1c557a96bd Prepare task 473 2012-07-27 19:26:54 +02:00
Laurent Destailleur
86ac10995f Fix perm 2012-07-27 19:26:38 +02:00
Marcos García
5fd7fcb6c4 Applied commits 1-8 2012-07-27 18:40:06 +02:00
Laurent Destailleur
0b048ebb94 [ bug #40 ] Export de donnes dangereux 2012-07-27 16:03:20 +02:00
Regis Houssin
79181f9183 Fix: add external user filter 2012-07-26 18:24:54 +02:00
Regis Houssin
5318fb54d5 Fix: bad path 2012-07-26 17:07:10 +02:00
Regis Houssin
a6758c2557 Fix: use span instead div for align image warning 2012-07-26 11:34:43 +02:00
Laurent Destailleur
75e9d93e69 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-25 12:21:04 +02:00
Laurent Destailleur
dce9b96260 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/lib/repair.lib.php
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-07-25 12:20:45 +02:00
Regis Houssin
7d2f7e9800 Fix: strict mode crazy 2012-07-25 11:46:33 +02:00
Laurent Destailleur
b63820c013 Checkstyle 2012-07-25 11:37:43 +02:00
Laurent Destailleur
7d08bd45d6 Checkstyle 2012-07-25 11:35:34 +02:00
Laurent Destailleur
758d613908 Fix: Checkstyle 2012-07-25 11:29:45 +02:00
Laurent Destailleur
276e32dc22 Fix: Products with no prices not visible 2012-07-25 11:27:25 +02:00
Regis Houssin
e12604cb71 Fix: avoid warning and strict mode story 2012-07-25 09:09:56 +02:00
Regis Houssin
65e183c8c9 Merge pull request #258 from FHenry/develop 
Develop
 2012-07-24 09:15:36 -07:00
Regis Houssin
8219ab9ec0 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-24 17:53:43 +02:00
Regis Houssin
c6cd17cf3f Fix: strict mode... far away 2012-07-24 17:52:46 +02:00
Laurent Destailleur
24c54ccaf1 Start to work on bug export 2012-07-24 16:19:46 +02:00
FHenry
8f2efa4879 Add syslog for debug 2012-07-24 14:25:21 +02:00
FHenry
3892c2ceca Usubscribe mailling module 
- Correct indentation
 2012-07-24 13:24:22 +02:00
Regis Houssin
812d02ebe0 Fix: strict mode and $mesgs 2012-07-23 22:04:06 +02:00
Regis Houssin
d5ff308992 Fix: declare $mesg and $mesgs in main.inc.php 
Fix: strict mode be back
 2012-07-23 20:52:55 +02:00
Regis Houssin
fb23364511 Fix: uniformize code 2012-07-23 16:10:54 +02:00
Laurent Destailleur
b63505ff15 Better fix 2012-07-23 11:10:18 +02:00
Regis Houssin
01ab1aa66f Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/core/modules/modCommissions.class.php
 2012-07-23 11:07:53 +02:00
Regis Houssin
bf807c27e5 Fix: uniformize code 2012-07-23 11:01:36 +02:00
Laurent Destailleur
7a8224c4d5 Normalize code 2012-07-23 10:55:29 +02:00
Laurent Destailleur
ea93e62e91 Fix: Checkstyle 2012-07-23 10:46:09 +02:00
Laurent Destailleur
f07c416f76 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-23 10:38:02 +02:00
Regis Houssin
6e41d645f0 Merge pull request #251 from cbattarel/commissions 
basic commissions management module
 2012-07-23 01:37:09 -07:00
Laurent Destailleur
087cf87722 New: Add state into substitution vars 2012-07-23 10:29:58 +02:00
Regis Houssin
a109d5f32b Fix: bug #467 2012-07-23 10:29:26 +02:00
Laurent Destailleur
68e619fb00 Fix: escape for create command 2012-07-22 21:50:08 +02:00
Laurent Destailleur
8080ee4565 Fix: dol_syslog at wrong place. 2012-07-22 16:57:15 +02:00
Laurent Destailleur
970d946e5b Fix: sql injection for create database 2012-07-22 16:53:32 +02:00
Laurent Destailleur
66ea44886b Fix: Permissions when using web services. 2012-07-22 02:33:21 +02:00
Laurent Destailleur
db4c6bd289 New: After first install, warning are visible onto mandatory setup 
not configured. Show also total number of activated modules.
 2012-07-22 01:03:19 +02:00
Christophe Battarel
b8fa4468ce add commissions module 2012-07-20 16:21:35 +02:00
Regis Houssin
fafd79a0f8 Fix: uniformize code (in progress) 2012-07-20 09:57:50 +02:00
Marcos García
7b478dbb35 Contracts box name wasn't being translated 2012-07-19 23:44:28 +02:00
Regis Houssin
b121a01ef8 Merge pull request #247 from cbattarel/marges 
Margin module
 2012-07-19 10:46:24 -07:00
Laurent Destailleur
fb9bf3ddac Fix: Restore menu entry [ bug #455 ] Impossible de crer une facture fournisseur 2012-07-19 18:23:10 +02:00
Laurent Destailleur
69ca9cf7d4 [ bug #445 ] Hex escaping in descriptions 2012-07-19 18:03:25 +02:00
Christophe Battarel
98a2cf547e correct module description and image 2012-07-19 16:27:08 +02:00