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

30328 Commits

Author SHA1 Message Date
Spangaro Alexandre
3ae6117e16 Reintegrate accounting.php in admin 2012-10-02 06:07:57 +02:00
Spangaro Alexandre
5c56bd629b Fix: add country in request 2012-10-02 05:45:50 +02:00
Spangaro Alexandre
8a99eedc6c Hum... Now it's work ! Little fix 2012-10-02 05:45:50 +02:00
Spangaro Alexandre
3e4fd761a5 Add function to choose chart of accounts 2012-10-02 05:45:49 +02:00
Laurent Destailleur
079ea61582 Fix: W3C 2012-10-02 00:36:23 +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
Laurent Destailleur
6971cf5779 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-01 22:05:22 +02:00
Laurent Destailleur
32fdfbb1cb Fix: Styles 2012-10-01 21:53:22 +02:00
Laurent Destailleur
43dce1c3fa Merge pull request #426 from grandoc/develop 
add canvas to adherents module
 2012-10-01 12:39:09 -07:00
Maxime Kohlhaas
1aa3156958 Task # 186 : new box of products with stock alert 2012-10-01 16:44:38 +02:00
Maxime Kohlhaas
af179eca94 Cosmetic : span buttons were'nt with the same style as links 2012-10-01 15:44:40 +02:00
Maxime Kohlhaas
8a62af1c78 Task # 559 : added use of discount in supplier bills 2012-10-01 11:49:20 +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
Maxime Kohlhaas
f62772a1c5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-10-01 11:26:42 +02:00
Maxime Kohlhaas
1d21f24fa7 Task # 559 : Add possibility to define a discount for min quantity on supplier product prices 2012-10-01 11:25:17 +02:00
Maxime Kohlhaas
6329c01d5d Added link to multi-origin invoicing on thirdparty page 2012-10-01 11:23:51 +02:00
Regis Houssin
8c17266ed4 Merge pull request #425 from marcosgdf/translations 
Added missing & improved es_ES translations
 2012-10-01 01:11:30 -07:00
Regis Houssin
7837356fe9 Merge pull request #423 from simnandez/develop 
Trad: Add missing translations
 2012-10-01 01:11:14 -07:00
Grand Philippe
0215ce9122 add canvas to adherents module 2012-10-01 10:05:03 +02:00
Marcos García
a4b0f7e521 Fixed es_ES typo 2012-10-01 04:17:17 +02:00
Marcos García
13cbf154e1 Added missing & improved es_ES translations 2012-10-01 03:09:37 +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
Regis Houssin
422f028ac9 Fix: use ADHERENT_BANK_USE for check or not bank via invoice 
Fix: code optimizing
 2012-09-29 12:07:07 +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
simnandez
6bbcb376b1 Trad: Add missing translations 2012-09-28 15:55:50 +02:00
Maxime Kohlhaas
6ac83a4205 Task # 355 : last correction 2012-09-28 14:58:47 +02:00
Maxime Kohlhaas
4deae1d948 Task # 355 : corrections + added on edit mode 2012-09-28 14:56:47 +02:00
Maxime Kohlhaas
398023e722 Task # 335 : translation 2012-09-28 14:29:20 +02:00
Maxime Kohlhaas
c0f22ac472 Task # 355 : autofill contat address with third party address 2012-09-28 14:27:16 +02:00
Regis Houssin
3b4090852c Merge pull request #420 from simnandez/develop 
Trad: Add missing translation
 2012-09-28 02:50:48 -07:00
Regis Houssin
0441c6dd46 Merge pull request #417 from aspangaro/develop 
Continue working on accountancy
 2012-09-28 02:43:54 -07:00
simnandez
67e38df6ee Trad: Add missing translation 2012-09-28 11:39:23 +02:00
Christophe Battarel
9f15a11b10 update lang files for import (csv options) 2012-09-28 10:28:17 +02:00
Christophe Battarel
15d7266abf import : add csv options (separator and enclosure) 2012-09-28 10:23:04 +02:00
Laurent Destailleur
d397be12ef Fix: Redirect on config home. 2012-09-27 23:57:10 +02:00
Laurent Destailleur
6c769cfaf3 Fix: postgresql compatibility 
Qual: Removed deprecated code
 2012-09-27 23:54:47 +02:00
Laurent Destailleur
49e79a2c28 Fix: database compatibility 2012-09-27 23:43:58 +02:00
Laurent Destailleur
e94ddde91d Fix: Patch calculation field odt 2012-09-27 21:08:32 +02:00
Laurent Destailleur
3a98f6903e Fix: If a customer has 2000 invoices, creating next one make 2000 
requests instead of 1.
 2012-09-27 20:54:04 +02:00
Laurent Destailleur
a98de7ef02 Fix: No error when hour not provided 2012-09-27 13:25:31 +02:00
Laurent Destailleur
9d732b0876 Fix: nowrap 2012-09-27 12:53:17 +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
ad0e3ba4a0 Fix: Better translation 2012-09-27 10:48:40 +02:00
Laurent Destailleur
05a97aaaf0 Fix: Bad alignement when no menus 2012-09-27 01:38:31 +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
Spangaro Alexandre
e4391207e4 Add new dictionnary to edit accountingsystem 2012-09-26 20:37:28 +02:00
Spangaro Alexandre
7cea254255 Continue working on accountancy 2012-09-26 20:37:27 +02:00
Regis Houssin
ca28aa7710 Fix: multicompany transverse mode compatibility 2012-09-26 12:10:25 +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
Laurent Destailleur
81cc311844 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-25 21:31:20 +02:00
Laurent Destailleur
9e6defab04 Fix on total 2012-09-25 21:30:55 +02:00
Regis Houssin
f77911f25f Fix: indent 2012-09-25 19:34:18 +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
Regis Houssin
d01f68a7af Fix: try to fix codesniffer error 2012-09-25 12:07:26 +02:00
Regis Houssin
a828d53074 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-25 08:13:03 +02:00
Regis Houssin
537152f950 Fix: regression 2012-09-25 08:10:12 +02:00
Christophe Battarel
2d911c097b update french translation for LocalTaxDesc 2012-09-25 08:06:47 +02:00
Regis Houssin
338f0b06d9 Fix: missing changes in migration file 2012-09-25 08:06:39 +02:00
Laurent Destailleur
c5ed476f25 Merge pull request #412 from atm-maxime/develop 
Task # 104 : Can create an invoice from several orders
 2012-09-24 16:05:19 -07:00
Laurent Destailleur
3b8104f013 Merge pull request #410 from marcosgdf/minor 
Fixed dictionary form
 2012-09-24 16:03:51 -07:00
Laurent Destailleur
f17906b331 Merge pull request #413 from aspangaro/develop 
Add a new column in llx_c_tva
 2012-09-24 16:03:05 -07: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
1d344ec89c Fix: increase length, is too restrictive 
Fix: use company name if lastname and firstname not exists
 2012-09-24 11:01:27 +02:00
Regis Houssin
c268a62cab Fix: try to disable 1900 test 2012-09-24 09:30:37 +02:00
Spangaro Alexandre
ba45295c7e Working for accountancy 2012-09-24 07:14:39 +02:00
Spangaro Alexandre
96dd6efae0 Minor fix for llx_c_tva 2012-09-24 07:14:38 +02:00
Spangaro Alexandre
a6f9111b54 Add new column in llx_c_tva 2012-09-24 07:14:37 +02:00
Laurent Destailleur
d3ef78df47 Qual: Respect database rules 
Qual: Add indexes
 2012-09-24 00:10:01 +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
Maxime Kohlhaas
bcbc35bd47 Task # 104 : added choice to auto close orders or not + translations 2012-09-23 18:00:30 +02:00
Maxime Kohlhaas
382bee4601 Task # 104 : added link on order list to the multi-orders invoice page 2012-09-23 17:59:50 +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
2519783ce2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-23 16:26:13 +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
Spangaro Alexandre
d8481fa19b Minor fix 2012-09-23 12:05:03 +02:00
Laurent Destailleur
9bbe0e6b1c Qual: Mutuamize codeby using tpl. 
New: Support unique field for extrafields
 2012-09-22 20:27:06 +02:00
Marcos García
a24031dc19 Fixed dictionary form 
When creating or modifying an entry, id param was lost
Also, missing </form> added
 2012-09-22 15:13:23 +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
2ef521ff30 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-22 09:19:24 +02:00
Regis Houssin
6151bc3a42 Fix: more simple 2012-09-22 09:18:36 +02:00
Regis Houssin
d7bbd8e947 Merge pull request #409 from simnandez/develop 
Trad: Update ca_ES donations translation
 2012-09-22 00:13:23 -07: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
simnandez
a25f2eae46 Trad: Update ca_ES donations translation 2012-09-21 16:30:38 +02:00
Regis Houssin
ba1b282c3b Fix: remove unused code 2012-09-21 11:28:28 +02:00
Regis Houssin
00af89488c Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-21 11:24:19 +02:00
Regis Houssin
50b0dcf47e New: try to use new tag 2012-09-21 11:23:31 +02:00
Laurent Destailleur
73562b7fc1 Use correct status for select 2012-09-21 09:33:12 +02:00
Regis Houssin
5ce44eff57 Fix: more simple 
Fix: eclipse auto align is bad !!! ;-)
 2012-09-21 08:50:23 +02:00
Regis Houssin
622f5dff59 Fix: use order entity instead customer entity 2012-09-21 08:23:48 +02:00
Laurent Destailleur
84089f3e53 Fix: bas tabs when socid provided into stats pages 2012-09-21 00:28:11 +02:00
Laurent Destailleur
320b24bca1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-21 00:13:41 +02:00
Laurent Destailleur
5e9cd37107 Uniformise look of PHP Info page. 2012-09-21 00:13:20 +02:00
Laurent Destailleur
c5bda9b1d5 Hide feature not available 2012-09-20 23:01:24 +02:00
Laurent Destailleur
408a4553ee Help center at end (because we leave software) 2012-09-20 22:54:05 +02:00
Laurent Destailleur
cf4be61349 Merge pull request #407 from simnandez/develop 
[ task #104 ] Possibilité de facturer plusieurs commandes. Working
 2012-09-20 10:54:19 -07:00
Laurent Destailleur
22a28abed1 Fix: Add more sql fix commands 2012-09-20 17:46:47 +02:00
simnandez
38b7aa69cb [ task #104 ] Possibilité de facturer plusieurs commandes. Working 2012-09-20 15:57:53 +02:00
simnandez
77ecd5c6fc [ task #104 ] Possibilité de facturer plusieurs commandes. Working 2012-09-20 15:55:51 +02:00
Laurent Destailleur
4881d8f1c2 Fix: Horizontal scrolling 2012-09-20 14:52:31 +02:00
Regis Houssin
073170514f Fix: increase memory limit 2012-09-20 09:13:02 +02:00
Laurent Destailleur
05e20b8f30 New: Can exclude some type of events 2012-09-20 00:42:51 +02:00
Laurent Destailleur
44591bd756 Use a specific type to isolate type of event that are event 
automatically added into agenda from other predefined events.
 2012-09-20 00:18:29 +02:00
Laurent Destailleur
596b12cacc Fix: sort in dictionnaries 2012-09-20 00:14:40 +02:00
Laurent Destailleur
5ea03e7448 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-19 20:45:43 +02:00
Laurent Destailleur
8b0cc3a953 Fix: Date format 2012-09-19 20:45:20 +02:00
Regis Houssin
d58c106f66 Fix: convert line delimiters !!! 2012-09-19 17:53:09 +02:00
Regis Houssin
63a68d0d1c Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-19 17:35:14 +02:00
Laurent Destailleur
b2825e1af3 Merge pull request #406 from simnandez/develop 
Develop
 2012-09-19 08:30:16 -07:00
Regis Houssin
98b38628c5 Fix: optimizing 2012-09-19 17:24:40 +02:00
Regis Houssin
40f5427520 Fix: broken features, ready for doliforge 2012-09-19 17:18:52 +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
simnandez
5344d0c330 Fix: Update spanish VAT data for first instalations 2012-09-19 16:15:35 +02:00
simnandez
31b91e68c1 Fix: Update spanish VAT data for first instalations 2012-09-19 16:09:41 +02:00
simnandez
1be38732d6 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2012-09-19 16:04:15 +02:00
Laurent Destailleur
8b7342f0ea New: Project notes use the note.tpl templates 2012-09-19 16:03:17 +02:00
simnandez
d18488966b Fix: Update spanish VAT data for first instalations 2012-09-19 15:51:00 +02:00
Laurent Destailleur
21c4baa13b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-19 15:10:39 +02:00
Laurent Destailleur
2ac3fbc5c6 New: Add clipart for holiday module 2012-09-19 15:10:23 +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
0b4df34091 Fix: Blank page when renaming product ref 2012-09-19 14:16:29 +02:00
Laurent Destailleur
0e76bd7ac6 Fix: Blank page when renaming a product ref 2012-09-19 14:11:01 +02:00
Laurent Destailleur
9306360d3c Remove warnings 2012-09-19 13:39:47 +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
simnandez
875edcad0d Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-09-19 10:32:00 +02:00
simnandez
cf72ffd650 Trad: Improve bank translations for adjust into pdf info size 2012-09-18 18:50:02 +02:00
simnandez
13aeca2ffd Fix: Add type of product/service into factures for a correct localtaxes 
calculation
 2012-09-18 18:27:28 +02:00
Laurent Destailleur
89dfd246d1 Init data must match migrated data 2012-09-18 18:27:10 +02:00
simnandez
b7837f9280 Fix: Localtaxes type only missing in propal update line 2012-09-18 18:18:30 +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
0bf29edb60 Fix: Add type of product/service into commandes for a correct 
localtaxes calculation
 2012-09-18 17:41:59 +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
simnandez
fab101d2e8 Fix: Spanish localtax1 must be only applicable to products 
Add localtax2_type
 2012-09-18 15:38:08 +02:00
simnandez
b65c23576a Trad: Add ca_ES and es_ES translations 2012-09-18 15:28:38 +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
303f0dc681 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-09-18 11:09:44 +02:00
Laurent Destailleur
ffbe2acc36 Fix: use https if https is used 2012-09-18 11:06:49 +02:00
Laurent Destailleur
4f0e4be449 Merge pull request #402 from cbattarel/develop 
add option to select contact type associated to commercial agents for margin and commission modules
 2012-09-18 01:24:00 -07:00
Christophe Battarel
951b98a963 add option to select contact type associated to commercial agents for margin and commission modules 2012-09-18 09:44:34 +02:00
Laurent Destailleur
eb964e6436 Fix: Should works for everybody like that 2012-09-17 22:08:41 +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
Regis Houssin
c42cf7ce78 Fix: broken features 2012-09-17 16:16:48 +02:00
Laurent Destailleur
7167edb244 Fix: Comment to avoid bug 2012-09-17 16:00:41 +02:00
Laurent Destailleur
237bcf35ed Merge pull request #401 from grandoc/develop 
missing translation
 2012-09-17 06:23:20 -07: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
Grand Philippe
d25e8fc584 missing translation 2012-09-17 11:18:20 +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
9ab0653902 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-17 01:39:49 +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
832a472325 Little clean of page 2012-09-16 22:45:58 +02:00
Regis Houssin
ada85df649 Fix: wrong permission 2012-09-16 21:12:55 +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
df2bac35c6 Merge pull request #399 from cbattarel/develop 
patch on the dictionnary setup of local taxes table to be able to set localtax type
 2012-09-16 04:40:54 -07:00
Christophe Battarel
a9ed3bc175 correction for previous patch on localtax 2012-09-16 10:12:43 +02:00
Christophe Battarel
05971f1952 patch on the dictionnary setup of local taxes table to be able to set localtax type 2012-09-16 10:08:41 +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
Laurent Destailleur
1fb26e2ab2 Fix: if 1 experimental module is on, we must always show tab 2012-09-15 13:37:55 +02:00
Regis Houssin
89e70cd61a Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-15 11:22:30 +02:00
Regis Houssin
43c0a03758 Fix: strict mode tornado 2012-09-15 11:21:22 +02:00
Regis Houssin
85a756bee4 Merge pull request #398 from grandoc/develop 
dyslexie
 2012-09-15 01:05:08 -07: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
Grand Philippe
f19321eaf6 dyslexie 2012-09-14 17:37:14 +02:00
Regis Houssin
4220229573 Fix: minor change 2012-09-14 15:56:50 +02:00
Regis Houssin
b33e59dd66 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-14 15:56:11 +02:00
Laurent Destailleur
e7d3d9496c first step for extrafield for contact/address 2012-09-14 12:15:55 +02:00
Regis Houssin
3a6be2b896 Fix: uniformize code 
fix: add current user for commercial by default
 2012-09-14 11:34:30 +02:00
Laurent Destailleur
643d6ff3f9 Fix: Debug feature predefined invoices 2012-09-14 10:09:56 +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
0a5c49b3d9 Fix: If no warehouse selected, no warning for stock in warehouse too 
low.
 2012-09-13 16:23:58 +02:00
Regis Houssin
125f499e82 Fix: dol_htmloutput_events is already call in llxFooter 2012-09-13 16:15:36 +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
84c61c9411 Fix: remove obsolete code and use "propal" instead "propale" 2012-09-13 16:11:08 +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
29b4e1f57a Removed not available module from demo 2012-09-13 09:19:45 +02:00
Laurent Destailleur
4b1c863673 Fix: removed warnings 2012-09-12 23:59:19 +02:00
Laurent Destailleur
a950f775e5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-12 20:50:00 +02:00
Laurent Destailleur
82435fb176 Merge pull request #396 from marcosgdf/translations 
Removed unused lines mistakenly introduced in previous PR #395
 2012-09-12 11:45:56 -07:00
Laurent Destailleur
c11c3897ef Qual: Uniformize code 2012-09-12 20:45:01 +02:00
Laurent Destailleur
b221b8878e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-12 20:34:25 +02:00
Laurent Destailleur
91e304d0d7 Move dev and experimental modules into a separated tab 2012-09-12 20:33:50 +02:00
Marcos García
c38274c111 Forgot to remove some lines... 2012-09-12 20:32:39 +02:00
Laurent Destailleur
d5e8037483 Merge pull request #395 from marcosgdf/translations 
Improved translations
 2012-09-12 11:08:55 -07:00
Laurent Destailleur
bd49dc81a3 Merge pull request #394 from simnandez/develop 
Localtaxes also in skip_update_total comprobation
 2012-09-12 10:54:42 -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
simnandez
4ac2ee83f2 Localtaxes also in skip_update_total comprobation 2012-09-12 19:07:23 +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
Marcos García
be174c6b46 Fixed problem with accentuated strings 2012-09-12 17:32:14 +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
Laurent Destailleur
41078019dd Make demo of foundation at end 2012-09-12 17:24:39 +02:00
Laurent Destailleur
a7ddbf8f10 Use key value if translation not found 2012-09-12 16:56:30 +02:00
Regis Houssin
f16a68bf01 Fix: remove unused tables 2012-09-12 16:40:46 +02:00
Regis Houssin
3bdda8429d Merge pull request #392 from marcosgdf/minor 
Fixed incorrect BackToList link
 2012-09-12 07:23:03 -07:00
Marcos García
d5fc2a9488 Fixed incorrect BackToList link 2012-09-12 16:11:16 +02:00
Regis Houssin
a663f8fb3b Fix: remove obsolete code 2012-09-12 16:02: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
11bb601059 Merge pull request #386 from marcosgdf/translations 
Added missing translations
 2012-09-12 05:53:40 -07: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
Regis Houssin
c6c2fd2f39 Fix: restore previous field type 2012-09-11 16:07:52 +02:00
Laurent Destailleur
a249061017 Fix: If object already loaded, the url was not returned. 2012-09-11 15:49:46 +02:00
Laurent Destailleur
bf9b8657c3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-09-11 15:43:29 +02:00
Laurent Destailleur
c10e587870 Fix: Bad init of specimen 2012-09-11 15:42:41 +02:00
Regis Houssin
a798069322 Merge pull request #388 from cbattarel/develop 
add en_US language files for commissions and margins modules
 2012-09-11 06:35:07 -07: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
Christophe Battarel
37b166024d add en_US language files for commissions and margins modules 2012-09-11 15:20:00 +02: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
Marcos García
d3eed9f15e Removed '=undefined' from translation files 2012-09-11 12:43:15 +02:00
Marcos García
f7fff8ecb3 Added missing translations removed in PR #371 2012-09-11 12:40:08 +02:00
Laurent Destailleur
c291ea2ec2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-09-11 11:23:08 +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
Marcos García
b3235887d3 Improved translations of menu edit 2012-09-10 23:50:46 +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
Laurent Destailleur
6159e71427 Merge pull request #384 from marcosgdf/task-539 
Better practice
 2012-09-10 14:32:42 -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
Laurent Destailleur
3a18633df3 Merge pull request #383 from marcosgdf/task-539 
Task #539 - Add new products into proposals,invoices... with barcode
 2012-09-10 14:04:50 -07:00
Laurent Destailleur
de339278bc Fix: removed warning 2012-09-10 22:59:50 +02:00
Marcos García
61e2596e4d Task #539 - Add new products into proposals,invoices... with barcode 2012-09-10 22:55:12 +02:00
Laurent Destailleur
4c05112662 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-09-10 17:11:15 +02:00
Regis Houssin
de54481129 Merge pull request #381 from marcosgdf/minor 
Translation improvements
 2012-09-10 07:56:37 -07:00
Christophe Battarel
c6da5b79fe change localtaxes parameters to be compatible with older calls 2012-09-10 16:49:36 +02:00
Laurent Destailleur
4847e946a4 Fix: Use varchar instead of char (for better compatibility, char is an 
old directive)
Fix: Restore usage of text field for "enabled" menu because, even if in
standard code, we use 0 or 1, into external module, or menu editor we
should be able to use full condition dynamic string.
 2012-09-10 16:20:34 +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
Laurent Destailleur
09d3d0a37d Fix: removed warning 2012-09-10 15:47:13 +02:00
Marcos García
d7d1c8ac65 Missing paper formats unit translations 2012-09-10 15:14:29 +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
Marcos García
b92f52cdf9 Social charges deductible field now with yes/no select 2012-09-10 14:12:31 +02:00
Regis Houssin
26ff406e4a Fix: use MODIFY instead CHANGE for just change the type of field 2012-09-10 13:25:34 +02:00
Regis Houssin
e9c72f812d Merge pull request #380 from marcosgdf/minor 
Modified llx_menu sql and improved add menu form
 2012-09-10 04:18:31 -07:00
Marcos García
74b28dab79 Merge branch 'develop' into minor 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-09-10 12:16:45 +02:00
Regis Houssin
9188a24c78 Merge pull request #379 from marcosgdf/translations 
Improved translations
 2012-09-10 03:07:07 -07:00
Regis Houssin
83179fc4f0 Merge pull request #378 from cbattarel/localtax 
prepare database for local taxes management (2nd try) - task 204 on doliforge
 2012-09-10 03:04:31 -07:00
Regis Houssin
4269878e6d Fix: restore varchar for the moment 2012-09-10 11:59:17 +02:00
Marcos García
f0803a7713 Improved es_ES translations 2012-09-10 11:15:54 +02:00
Christophe Battarel
2e4aa1131a prepare database for local taxes management 
add localtax1_type and localtax2_type in database.
these type are char(1) and support following values :
'0' : local tax not applied
'1' : local tax apply on products and services without vat (vat is not applied on local tax)
'2' : local tax apply on products and services before vat (vat is calculated on amount + localtax)
'3' : local tax apply on products without vat (vat is not applied on local tax)
'4' : local tax apply on products before vat (vat is calculated on amount + localtax)
'5' : local tax apply on services without vat (vat is not applied on local tax)
'6' : local tax apply on services before vat (vat is calculated on amount + localtax)
'7' : local tax is a fix amount applied on global invoice
 2012-09-10 11:00:35 +02:00
Regis Houssin
e1fcaf738f Fix: move llx_ecm_documents in external module 2012-09-10 10:55:06 +02:00
Laurent Destailleur
66af48697c Doc 2012-09-10 10:25:47 +02:00
Laurent Destailleur
1a746ad99b Merge pull request #377 from GPCsolutions/societe_commercial 
Inverted the clause for commercial_id affectation
 2012-09-10 01:21:38 -07:00
Raphaël Doursenaud
75647aa19d Inverted the clause for commercial_id affectation 
This permits using a script to import commercial_id.
The clause to automatically affect the current user as commercial doesn't seem to work anyway
 2012-09-10 10:00:22 +02:00
Laurent Destailleur
3335bf629b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-10 09:47:11 +02:00
Laurent Destailleur
1d341caffd Merge pull request #376 from simnandez/develop 
Fix: use $ldap instead $this
 2012-09-10 00:46:35 -07:00
simnandez
f390bec1ac Fix: use $ldap instead $this 2012-09-10 09:06:37 +02:00
Marcos García
45cd500882 Modified llx_menu sql and improved new menu form 
Modified `enabled` field to tinyint(1) because only holds 0 or 1
Enabled input field now made yes/no select
 2012-09-10 02:09:52 +02:00
Marcos García
5536fecc3b Missing translations & improved es_ES translations 2012-09-10 01:15:57 +02:00
Regis Houssin
61159ca220 Fix: use specific hash for ref 2012-09-09 22:05:53 +02:00
Laurent Destailleur
3b3e67758e Fix: Removed warnings 2012-09-09 20:33:00 +02:00
Regis Houssin
5ff1240287 Fix: increase size for big path and where data is encrypted 2012-09-09 18:28:36 +02:00
Regis Houssin
d7f3deffce Fix: convert line delimiters 2012-09-09 16:32:03 +02:00
Regis Houssin
a7bfc722d5 Fix: use specific variable 2012-09-09 16:31:00 +02:00
Regis Houssin
9058439015 Fix: best practice 2012-09-09 16:17:19 +02:00
Laurent Destailleur
1450ee1978 Merge pull request #375 from marcosgdf/barcode-mini-search 
Added Copyright and changelog entry
 2012-09-09 06:34:26 -07:00
Laurent Destailleur
83cdb2167e Fix: Use bad parameter name 2012-09-09 15:23:09 +02:00
Marcos García
94090e85db Added Copyright and changelog entry 2012-09-09 15:12:04 +02:00
Laurent Destailleur
fcce22026a Fix: Bad name of var 2012-09-09 15:09:54 +02:00
Laurent Destailleur
8f20d31b4f Merge pull request #374 from marcosgdf/barcode-mini-search 
Allow to search barcodes in the permanent mini search box
 2012-09-09 06:04:20 -07: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
Marcos García
33c1fd2a01 Allow to search barcodes in the permanent mini search box 
Requested by Joaquim in Dolibarr.es forum
http://dolibarr.es/index.php/foro/9-sugerencias/1337-buscador-de-la-izquierda/
 2012-09-09 14:43:41 +02:00
Laurent Destailleur
2c2d17b101 Fix: Try a fix to avoid having the hover on array that should not have 
it.
 2012-09-09 13:13:24 +02:00
Laurent Destailleur
a551fa982e Comments 2012-09-08 21:29:03 +02:00
Laurent Destailleur
4f72b0ea92 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-08 18:58:15 +02:00
Laurent Destailleur
5bd14b20d5 Trans: Add bg_BG language and fix monor strings 
Fix: Removed warning into autotranslator tool.
 2012-09-08 18:57:52 +02:00
Regis Houssin
0a61f13c7a Fix: restore broken features 2012-09-08 18:10:19 +02:00
Regis Houssin
7a0b8b3b1a Fix: saturday strict mode 2012-09-08 17:43:14 +02:00
Laurent Destailleur
4ac14fd927 Merge pull request #371 from simnandez/develop 
Try to enable hover in lists into auguria and eldy themes
 2012-09-08 06:27:28 -07:00
Laurent Destailleur
39ca93bb7a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-08 15:18:37 +02:00
Laurent Destailleur
ce64a26875 A different fix to keep username. 2012-09-08 15:18:14 +02:00
Laurent Destailleur
600915b8ec Revert "Revert "Fix: GETPOST is already in method"" 
This reverts commit 0d13b80fec.
 2012-09-08 15:17:53 +02:00
Regis Houssin
d2e336ddd6 Fix: GET and POST treatment in dol_loginfunction() 2012-09-08 15:16:27 +02:00
Laurent Destailleur
26d3234dc8 Update pt_PT 2012-09-08 15:12:12 +02:00
Laurent Destailleur
0d13b80fec Revert "Fix: GETPOST is already in method" 
This reverts commit c4f3e872ca.
 2012-09-08 13:33:52 +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
0cf89eac08 Doxygen 2012-09-08 02:17:08 +02:00
Laurent Destailleur
a7fdbcbddc Update auguria module 2012-09-08 02:03:47 +02:00
Laurent Destailleur
1721f564c8 Increase size of field into database 2012-09-08 01:42:15 +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
d60211a7c8 Fix: update entity field 2012-09-07 17:43:27 +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
ab5e4db9c0 Fix: possibility to use with another element 2012-09-07 13:47:35 +02:00
Regis Houssin
847a335ee5 TODO: just use ajaxdirtree.php for load database after ajax refresh and 
not scan directories, too slow every page loaded !
 2012-09-07 13:33:13 +02:00
Regis Houssin
830ec2d4fb Fix: reload page after refresh 2012-09-07 13:28:38 +02:00
Regis Houssin
2ee6f33f72 New: add ajax refresh method and code more clear 2012-09-07 13:27:12 +02:00
Regis Houssin
928aae7f79 Fix: strict mode day 2012-09-07 11:40:59 +02:00
Regis Houssin
77bbae7723 Fix: remove older models for avoid warnings 2012-09-07 11:18:08 +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
Regis Houssin
68c71896d4 Fix: add extraparams field for more parameters 2012-09-07 10:50:19 +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
Laurent Destailleur
6e90e60268 Fix data init 2012-09-06 23:46:35 +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
210662d39e Fix: [ bug #533 ] 2012-09-06 15:18:30 +02:00
Regis Houssin
282d9c9c29 Merge pull request #372 from cbattarel/develop 
dont use lines without buying price for margin calculation if ForceBuyPr...
 2012-09-06 06:10:51 -07:00
Christophe Battarel
2b010c9ba4 dont use lines without buying price for margin calculation if ForceBuyPriceIfNull is set 2012-09-06 13:49:39 +02:00
Regis Houssin
20751e0279 Fix: [ bug #533 ] Using quotes in intervention sheet description leads 
to empty description
 2012-09-06 12:55:54 +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
Regis Houssin
3c63307087 Fix: remove dead code 2012-09-06 12:30:03 +02:00
Regis Houssin
4309705b4c Fix: bad array 2012-09-06 12:26:23 +02:00
Laurent Destailleur
055bb7a9b8 Fix: Restore correct includes. 
All entry pages must start with a require main.inc.php, except command
line script that start with master.inc.php.
To avoid errors into jenkins, we must exclude file common.inc.php.
All files ending *.inc.php must be excluded from jenkins because such
files are not "start/entry pages". That's the difference with
standard files *.php.
*.php
 2012-09-06 10:39:25 +02:00
Laurent Destailleur
1a2ead7bdf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-06 10:22:56 +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
0ec9793308 Fix: Bad test 2012-09-06 10:18:45 +02:00
Regis Houssin
00784ffce5 Fir: go to hell 2012-09-06 09:48:25 +02:00
Regis Houssin
c99e730e0c Fix: last try before asylum 2012-09-06 09:27:23 +02:00
Regis Houssin
7bd18ba840 Fix: phpunit error again ! pfff 2012-09-06 09:17:01 +02:00
Regis Houssin
c9ea50c51f Try another method 2012-09-06 09:09:00 +02:00
Regis Houssin
83dd81110d Fix: bad path the return 2012-09-06 09:01:54 +02:00
Regis Houssin
9e4ff47711 Fix: bad path 2012-09-06 08:52:31 +02:00
Regis Houssin
e0bb5f334d Try to avoid phpunit errors 2012-09-06 08:31:38 +02:00
Regis Houssin
0b057a071a Fix: for avoid phpunit errors 2012-09-06 08:24:29 +02:00
Laurent Destailleur
2141a33d53 Trans: Init bulgarian files 2012-09-06 00:17:45 +02:00
Laurent Destailleur
2ff87a2c1c Exclude dir 2012-09-05 20:41:58 +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
655a288f8b Fix: Removed last separator line 2012-09-05 19:52:17 +02:00
Laurent Destailleur
76bdd878cf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-05 19:35:42 +02:00
Laurent Destailleur
aef1e29ad7 Qual: Interface is more clear. 2012-09-05 19:35:04 +02:00
Regis Houssin
67f0313802 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-05 19:25:20 +02:00
Regis Houssin
9d67b04076 New: add possibility to force entity in login page 2012-09-05 19:22:03 +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
simnandez
bae63a70a1 Trad: Add holiday first translation 2012-09-05 17:51:25 +02:00
Regis Houssin
3823e5d374 New: add possibility to add or force default directories 2012-09-05 17:37:58 +02:00
simnandez
99946d828c Trad: Add missing translations 2012-09-05 16:39:01 +02:00
Laurent Destailleur
2e2f156839 Fix: title 2012-09-05 16:20:51 +02:00
Laurent Destailleur
7910993d90 Update favicon 2012-09-05 15:35:26 +02:00
simnandez
ff0bf4417b Try to enable hover in lists into auguria and eldy themes 2012-09-05 15:29:21 +02:00
Laurent Destailleur
2aafe5eef1 Merge pull request #370 from simnandez/develop 
Develop
 2012-09-05 05:43:16 -07: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
simnandez
a3ecb1203b New: Add PRODUCT_PRICE_MODIFY trigger 2012-09-05 14:38:16 +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
00cd6a050d Uniformise code 2012-09-05 13:10:13 +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
Laurent Destailleur
9c11092f46 Uniformize code 2012-09-05 11:15:38 +02:00
Regis Houssin
5be523faad Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-05 11:05:02 +02:00
Laurent Destailleur
ef7de86d7e Show more param on conf.php file 2012-09-05 10:38:48 +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
92fb64d112 Fix: PHP 5.2 compatibility 2012-09-05 10:11:18 +02:00
Laurent Destailleur
d57ba942f4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-05 09:59:03 +02:00
Laurent Destailleur
cc38fbe33f Uniformize code 2012-09-05 09:58:35 +02:00
Laurent Destailleur
f9607037a7 Qual: Removed deprecated table 2012-09-05 09:58:09 +02:00
Regis Houssin
f056ca3a41 FIXME: class commonagenda not exist 2012-09-05 08:07:15 +02:00
Laurent Destailleur
105cb2373c Add comment 2012-09-05 04:13:31 +02:00
Laurent Destailleur
e441b246a8 Debug of holiday module 2012-09-05 03:57:26 +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
75166db2ed Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-04 18:35:03 +02:00
Regis Houssin
1b238a7086 Fix: try to use jquery blockUI 2012-09-04 18:34:36 +02:00
Laurent Destailleur
2bf933fbab Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-09-04 17:48:33 +02:00
Laurent Destailleur
dcc6b5e2c1 Qual: Removed deprecated files 2012-09-04 17:44:23 +02:00
Regis Houssin
83b5860ee1 Fix: for use with command line 2012-09-04 12:27:43 +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
Laurent Destailleur
bfc933df4d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-03 18:18:12 +02:00
Laurent Destailleur
841586b050 Removed dead code. Allow to use attachment=0. 2012-09-03 18:17:19 +02:00
Regis Houssin
5622d1624c New: prepare for extend GED module 2012-09-03 18:03:39 +02:00
Laurent Destailleur
ac02450200 New: Can also use attachment=0 as parameter (for test purpose) 2012-09-03 18:01:07 +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
Regis Houssin
fc29e7c432 Fix: $attachement is already true by default 
Fix: remove deprecated code
 2012-09-03 17:01:03 +02:00
Regis Houssin
14b1b1d6e5 Fix: missing upgrade with minor version 2012-09-03 16:28:55 +02:00
Regis Houssin
616ee24683 Fix: try to use another popup jquery plugin gpl compatible 2012-09-03 11:45:01 +02:00
Laurent Destailleur
36571f1d54 Removed dead code 2012-09-03 10:39:21 +02:00
Laurent Destailleur
51ea3c0775 Minor look fix 2012-09-03 10:27:31 +02:00
Laurent Destailleur
9eb21c3d9f Fix: Minot miscellanous fix 2012-09-03 10:17:58 +02:00
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
d2ae90f938 Fix: strict mode everywhere 2012-09-02 22:48:52 +02:00
Regis Houssin
8a5fe809f4 Fix: remove deprecated function and avoid warnings 2012-09-02 22:31:25 +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
3659887134 Fix: add list of files 2012-09-02 22:15:00 +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
b9ac974013 Fix: use ajax button on/off 2012-09-02 22:04:30 +02:00
Regis Houssin
026cf124af Fix: avoid php warning 2012-09-02 22:01:05 +02:00
Regis Houssin
0ad137e734 Fix: uniformize code 2012-09-02 22:00:14 +02:00
Regis Houssin
00e0649cde Fix: strict mode plaza 2012-09-02 21:58:55 +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
913b923886 Fix: error report when duplicate product 2012-09-02 15:09:48 +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
7f40fe18a4 Works on larger screens 2012-09-02 14:43:57 +02:00
Laurent Destailleur
f783960f19 Fix: Avoid repeat of img 2012-09-02 14:32:56 +02:00
Laurent Destailleur
c2dc2ba115 Fix: percentage during creation 2012-09-02 14:26:40 +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
Laurent Destailleur
b891975b7d Fix: edit of percentage 2012-09-02 14:10:51 +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
671006316a Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-02 09:02:16 +02:00
Regis Houssin
9813344346 Fix: broken features and uniformize code 2012-09-02 08:50:42 +02:00
Laurent Destailleur
1ccb8f3363 New: Add a test during upgrade if database version is too low. 2012-09-02 01:47:21 +02:00
Regis Houssin
6f8b63f0ef Merge pull request #367 from simnandez/develop 
Fix: Bad assignation of const for pdf delivery module name
 2012-09-01 09:48:57 -07:00
Regis Houssin
7ff475c462 Fix: Modify spanish VAT to new rates (Juanjo) 2012-09-01 18:43:51 +02:00
Regis Houssin
54acdc71f6 Fix: this field is for 3.3 2012-09-01 18:09:47 +02:00
simnandez
44a3db8785 Fix: Bad assignation of const for pdf delivery module name 2012-09-01 17:02:38 +02:00
Laurent Destailleur
c5dea16e31 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-01 14:34:40 +02:00
Grand Philippe
56a620bc88 fix: wrong link 2012-08-31 19:07:47 +02:00
Laurent Destailleur
f64e6ced25 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-31 18:38:35 +02:00
Laurent Destailleur
9c13f81bef Trans 2012-08-31 18:38:01 +02:00
Regis Houssin
c9886fb86d Fix: same size of view lines 2012-08-31 16:50:46 +02:00
Laurent Destailleur
83ab8c05e2 New: More surface control into project edition 2012-08-31 14:31:36 +02:00
Laurent Destailleur
6709d3d377 Fix: moving date of task when moving date of project was not working 2012-08-31 14:31:08 +02:00
Laurent Destailleur
27846d1698 Fix: Start and end date not saved at project creation 
Conflicts:
	htdocs/projet/class/project.class.php
 2012-08-31 12:55:10 +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
Regis Houssin
57fa5d6c03 Merge pull request #363 from marcosgdf/translations 
Fixed es_ES translation typo
 2012-08-30 23:33:38 -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
2b63ea314c Fixed es_ES translation typo 2012-08-31 07:16:39 +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
Laurent Destailleur
96e0586934 Fix: enhance cleaning of database 2012-08-30 17:11:42 +02:00
Laurent Destailleur
ddb31d4b2c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/webservices/server_user.php
 2012-08-30 16:54:59 +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
Regis Houssin
4a97ea9b7b Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-29 17:30:11 +02:00
Laurent Destailleur
21555f00ef Fix: Bad test 2012-08-29 16:59:36 +02:00
Regis Houssin
d6918d7a87 Fix: upgrade ckeditor 2012-08-29 16:31:48 +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
Laurent Destailleur
07aae3200f Fix: Test on ref and ref_ext into webservice 2012-08-29 10:23:15 +02:00
Regis Houssin
5f32617843 Fix: restore dolibarr parameters 2012-08-29 10:14:40 +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
Laurent Destailleur
e027f12e0a Merge pull request #359 from marcosgdf/minor 
Uniformized SQL error management in boxes
 2012-08-29 00:45:27 -07:00
Laurent Destailleur
d710de5e64 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-29 09:43:45 +02:00
Laurent Destailleur
3771ad2e87 Fix: Restore line feed after removing it from select_product function. 2012-08-29 09:43:24 +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
Regis Houssin
3cb93e90cd Merge pull request #358 from marcosgdf/translations 
Improved translations
 2012-08-28 22:22:00 -07:00
Marcos García
f9eb3873b0 Improved and added missing es_ES translations 2012-08-29 00:32:57 +02:00
Marcos García
1a676b5b4b Added missing permission translations 2012-08-29 00:32:16 +02:00
Marcos García
7c0463b215 Used incorrect translation keys 
Duplicated keys
 2012-08-29 00:29:47 +02:00
Laurent Destailleur
e3e36dca6d We set to zero to unifrmize way of working between customer and supplier 
payments
 2012-08-28 23:39:11 +02:00
Laurent Destailleur
8a74c928f3 Fix: regression 2012-08-28 23:01:04 +02:00
Laurent Destailleur
745b35f94e Missing translation key 2012-08-28 22:39:22 +02:00
Laurent Destailleur
6853ed0e5e Fix: permission for a user to view its own card using webservice 2012-08-28 22:31:51 +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
990a13146d Fix: permission for a user to view its own card using webservice 2012-08-28 18:47:32 +02:00
Laurent Destailleur
4108e48d5c Merge pull request #349 from FHenry/develop 
Change size of element type
 2012-08-28 09:25:08 -07: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
4bb837dc6a Fix: update icon 2012-08-28 17:01:16 +02:00
Regis Houssin
c0bde33b1f Fix: [ task #498 ] add same tests in edit mode 2012-08-28 16:11:40 +02: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
Regis Houssin
526f0e310b Fix: convert line delimiters 2012-08-28 12:38:07 +02:00
Regis Houssin
06b4cc3724 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-28 12:37:06 +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
Laurent Destailleur
562e2b6a7b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-28 09:33:58 +02:00
Laurent Destailleur
26b05212c7 Fix: Missing include 2012-08-28 09:33:43 +02:00
Regis Houssin
57f5338e4f Merge pull request #353 from marcosgdf/coding-style 
Refactored Mailmanspip class
 2012-08-27 22:55:18 -07:00
Marcos García
c302567d1d Refactored Mailmanspip class 
Removed duplicated code
Added missing error tests and logs
 2012-08-28 07:02:00 +02:00
Marcos García
afee791b35 Forgot to add the copyright 2012-08-28 05:53:44 +02:00
Marcos García
c6fe6c32bc Translated some MailmanSPIP strings 2012-08-28 05:46:48 +02:00
Marcos García
f64ab52993 Fixed MailmanSPIP problem + little refactor 2012-08-28 05:22:39 +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
Laurent Destailleur
6c0dac2f17 More things to repair 2012-08-27 19:30:09 +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
Laurent Destailleur
8a42cc26b7 Fix: Bad syntax of class name 2012-08-27 18:00:59 +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
cc22f25d97 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-27 13:07:40 +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
Marcos García
7be72c39b1 Fixed SQL problems with llx_accounting.sql 2012-08-27 03:17:57 +02:00
Marcos García
07070b238b Fixed SQL syntax problem 2012-08-27 02:41:49 +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
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
FHenry
d716763896 change size of elementtype 2012-08-26 21:53:40 +02:00
Regis Houssin
efa471b12b Fix: test if ckeditor is enabled 2012-08-26 21:47:56 +02:00
Laurent Destailleur
7fa4b9b423 Fix: Clean feature [ task #515 ] Add a "no e-mail" checkbox on contact 2012-08-26 20:28:19 +02:00
Laurent Destailleur
b2808f6a60 Doxygen 2012-08-26 20:18:29 +02:00
Laurent Destailleur
a18187620e [ bug #512 ] Filter system not working in banks > account > transactions 2012-08-26 19:23:08 +02:00
FHenry
7895ff0e5c Change size of element type 2012-08-26 19:03:23 +02:00
Laurent Destailleur
a08606f456 Add constant because such table should be edited with a specific page 
(that does not exist yet, but that should exists as soon as someone
works on it).
 2012-08-26 18:54:34 +02:00
Laurent Destailleur
5bc5707236 Merge pull request #348 from aspangaro/develop 
I added the patch but i also added a hidden constant to make the accountancy dictionnary appears because this feature is not yet used.
 2012-08-26 09:45:10 -07:00
Laurent Destailleur
fd00b16b19 Fix: Bad log format 2012-08-26 18:28:59 +02:00
Laurent Destailleur
efc61be1a4 Fix: Rounding at wrong place 2012-08-26 18:27:15 +02:00
Laurent Destailleur
56d19437f4 Fix: [ bug #524 ] Donation receipt html_cerfafr is not localized 2012-08-26 18:01:29 +02:00
Spangaro Alexandre
62322b3bda Better translation 2012-08-26 17:24:49 +02:00
Spangaro Alexandre
9050431f87 Simply way to update chart of accounts 2012-08-26 17:11:19 +02:00
Laurent Destailleur
9c04cb25db Qual: Removed not used files. 2012-08-26 15:51:28 +02:00
Laurent Destailleur
15eec16bee Fix: Regression 2012-08-26 15:31:06 +02:00
Laurent Destailleur
7db8c8aab9 Fix: Regression 2012-08-26 14:14:27 +02:00
Laurent Destailleur
1c0303ea6b Fix: Restore broken feature. 2012-08-26 13:44:42 +02:00
Laurent Destailleur
7c455da7c7 Revert "for module ultimatepdf" 
This reverts commit 72895fa4b7.
 2012-08-26 13:24:28 +02:00
Laurent Destailleur
3ab014e5c0 Fix: Use bad date. 
Fix: Autoselect of type.
 2012-08-26 13:09:34 +02:00
Laurent Destailleur
bda132b07f Fix: [ bug #254 ] Database backup not working with complex passwords 2012-08-26 00:33:37 +02:00
Laurent Destailleur
8bcb90fcd0 Fix: syntax error 2012-08-26 00:28:04 +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
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
e00b74619a Fix: regression 2012-08-25 11:09:58 +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
Marcos García
082753d115 Refactored code 2012-08-24 19:55:31 +02:00
Marcos García
977571e032 Forgot to apply the patch to the rest of the files 2012-08-24 18:32:19 +02:00
Grand Philippe
2d34e7bf8b fix some issue within typhon pdf 2012-08-24 16:34:05 +02:00
Regis Houssin
a0b3ea0dd4 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 18:52:55 +02:00
Regis Houssin
ead2a81baf Fix: merge problem 2012-08-23 18:45:41 +02:00
Regis Houssin
56a22d2b59 Fix: rename for security raison 2012-08-23 18:15:54 +02:00
Regis Houssin
eca37eb123 Fix: [ bug #497 ] Module Order Supplier inaccessible altogether because 
of a missing SQL field
 2012-08-23 17:24:29 +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
45971ce6f0 Merge pull request #343 from marcosgdf/minor 
Translations + Little refactor
 2012-08-23 08:10:54 -07:00
Regis Houssin
995c7f13d3 New: [ task #498 ] part3 2012-08-23 13:45:51 +02:00
Marcos García
752c867882 I like more this variable name :D 2012-08-23 09:45:52 +02:00
Marcos García
cb29cfed7b Translations + Little refactor 2012-08-23 09:43:13 +02:00
Marcos García
0ecfe0465e Fixed bug #499 
The input method of supplier orders wasn't being translated
 2012-08-23 09:20:30 +02:00
Regis Houssin
51d3d33947 Merge pull request #339 from marcosgdf/bug-511 
Fixed bug #511
 2012-08-23 00:02:23 -07:00
Regis Houssin
4d1555f4ca Merge pull request #338 from atm-maxime/mko515 
Mko515
 2012-08-23 00:01:05 -07:00
Marcos García
fcb4f5ce67 Renamed MySQL alias that could cause conflicts 2012-08-23 09:00:31 +02:00
Marcos García
44cc4ae949 Some strings weren't being translated 
Thanks to @grandoc and I.D & L (idl-mp.com) for the french translations
 2012-08-23 08:46:22 +02: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
Maxime Kohlhaas
39de1cb010 Task 515 : Correction on SQL request 2012-08-23 08:43:29 +02:00
Marcos García
66eabbe4a9 Improved es_ES translations 2012-08-23 08:33:18 +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
Marcos García
43e4f139d5 Fixed bug #511 
A pagination problem was causing duplicated records
https://doliforge.org/tracker/?func=detail&aid=511&group_id=144
 2012-08-23 08:21:32 +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
99e7b82b69 Merge pull request #336 from marcosgdf/minor 
Fixed string not being translated
 2012-08-22 22:40:02 -07:00
Regis Houssin
08ea9c4351 Merge pull request #334 from grandoc/develop 
Develop
 2012-08-22 22:39:39 -07:00
Regis Houssin
4bdb2047a9 Merge pull request #335 from marcosgdf/translations 
Added missing en_US translations
 2012-08-22 22:38:46 -07:00
Marcos García
5769c0facc Changed incorrect includes 2012-08-23 02:46:16 +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
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
56264f0bf5 Fixed incorrect change 2012-08-22 23:44:17 +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
Maxime Kohlhaas
06ab1f6f94 Task 515 : New field added on contact : no_email 2012-08-22 22:59:10 +02:00
Marcos García
bed4e7bc72 Fixed string being not translated 2012-08-22 22:36:08 +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
Marcos García
25042c1ef9 Added missing en_US translations 
Made by tanayhan
http://www.dolibarr.org/forum/fbprofile/userid-7996
 2012-08-22 07:13:02 +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
Philippe Grand
33ea1e1622 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2012-08-20 14:44:20 +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
Philippe Grand
158019f161 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2012-08-20 11:07:28 +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
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
Philippe Grand
b2771660d3 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2012-08-20 08:43:10 +02:00
Regis Houssin
8719f87781 Fix: avoid warning "is not a legal ECMA-262 octal constant" 2012-08-20 08:30:55 +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
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
00781031d8 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-20 01:30:28 +02:00
Regis Houssin
3991e0b13d Fix: add accountancy code error message 2012-08-20 01:29:13 +02:00
Laurent Destailleur
f0d0539766 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-08-20 00:40:07 +02:00
Laurent Destailleur
a0796423e9 Move warning to info 2012-08-20 00:39:35 +02:00
Regis Houssin
24cc07815d Fix: remove old accountancy code, can cause blank screen 2012-08-20 00:36:51 +02:00
Laurent Destailleur
c664ac3cfa Fix: Default value was not defined 2012-08-20 00:27:38 +02:00
Regis Houssin
a856ad0afa Fix: strict mode sunshine 2012-08-19 09:05:50 +02:00
Regis Houssin
6729cd9b4b Merge pull request #330 from marcosgdf/fix-bug-504 
Fixed bug #504
 2012-08-18 22:48:24 -07:00
Marcos García
8639f1a414 Fixed bug #504 
https://doliforge.org/tracker/?func=detail&aid=504&atid=246&group_id=144
 2012-08-19 03:37:37 +02:00
Marcos García
bced5f3bca Added missing es_ES translation 2012-08-19 03:36:04 +02:00
Philippe Grand
72895fa4b7 for module ultimatepdf 2012-08-18 21:31:12 +02:00
Regis Houssin
eb24a2fb4d Merge pull request #324 from simnandez/develop 
Trad: Add ca_ES missing translations
 2012-08-18 12:04:58 -07:00
Regis Houssin
88becc9592 Merge pull request #325 from marcosgdf/translations 
Added missing permission translation
 2012-08-18 12:03:41 -07:00
Regis Houssin
4439d829e3 Merge pull request #328 from marcosgdf/coding-style 
Removed duplicated code
 2012-08-18 12:02:52 -07:00
Marcos García
7608905b3c Removed duplicated code 2012-08-18 20:51:30 +02:00
Regis Houssin
b4e324a515 Fix: add ht and ttc fields 2012-08-18 19:05:59 +02:00
Marcos García
d32ed9b39c Missing copyright 2012-08-18 18:49:18 +02:00
Marcos García
44fd4e7eb8 Fixed a SQL error when listing lines of an invoice 
Column 'localtax1_tx' in field list is ambiguous
 2012-08-18 18:47:12 +02:00
simnandez
ea8c380ef3 Trad: Add missing ca_ES translations 2012-08-18 18:45:23 +02:00
Marcos García
12282a8a20 Added missing permission translation 2012-08-18 17:27:12 +02:00
simnandez
c8a1bc5490 Qual: A closed contract no more invoiceable 2012-08-18 16:42:46 +02:00
simnandez
16e5742ae2 Trad: Add ca_ES missing translations 2012-08-18 13:17:27 +02:00
simnandez
8f8cdf78fa Trad: Improve ca_ES and es_ES translations 2012-08-18 12:33:10 +02:00
simnandez
4fdf38b51c Trad: Improve ca_ES and es_ES translations 2012-08-18 12:12:17 +02:00
Regis Houssin
74c1fa2263 Fix: bad rights 2012-08-18 10:52:10 +02:00
Regis Houssin
4aa8d0eb0c Fix: [ bug #501 ] Error while trying to modify an user 2012-08-18 10:19:01 +02:00
Regis Houssin
eeb52eee0d Fix: [ bug #500 ] PHP Warning when creating dict line 2012-08-18 09:57:42 +02:00
Regis Houssin
058d0b1b08 Fix: [ bug #503 ] Unable to delete linked file to a deposit 2012-08-18 08:51:52 +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
add63c7320 Merge pull request #321 from marcosgdf/minor 
Project::setClose wasn't setting the new status
 2012-08-17 22:28:39 -07:00
Regis Houssin
e7b63faaa8 Merge pull request #320 from marcosgdf/project-upload-bug 
Fixed a bug where files were not being uploaded to a project's task
 2012-08-17 22:27:39 -07: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
Marcos García
737b7d4946 Improved es_ES translation 2012-08-18 06:10:58 +02:00
Marcos García
30d7aa0383 Missing es_ES translation and improved the rest of them 2012-08-18 06:00:05 +02:00
Marcos García
4842da5679 Project::setClose wasn't setting the new status 2012-08-18 05:57:25 +02:00
Marcos García
1339796492 Untranslated dict errors 2012-08-18 05:14:21 +02:00
Marcos García
f7a7ca4ff2 Fixed a bug where files were not being uploaded to a project's task 
Reported by Jose Antonio Garcia in dolibarr.es' forum
http://www.dolibarr.es/index.php/foro/7-bugs-versiones-estables/1250-error-subir-archivo-en-una-tarea-de-un-proyecto
 2012-08-18 04:09:28 +02:00
Marcos García
f5b5f88f84 Added missing copyright 2012-08-18 00:04:52 +02:00
Marcos García
46ab7c597a Missing translation in PoS > Print Ticket page 2012-08-17 23:50:22 +02:00
Marcos García
952204564f Missing dict translation because of translated key 2012-08-17 23:43:08 +02:00
Marcos García
da762903bb Missing paper format dict translations 2012-08-17 23:28:15 +02:00
Regis Houssin
bc9ab610ea Merge pull request #317 from simnandez/develop 
Trad: add mailminspip into ca_ES
 2012-08-17 11:16:32 -07:00
Regis Houssin
5ff8d74d34 Merge pull request #316 from marcosgdf/minor 
Translated message was generating an incomplete string
 2012-08-17 11:15:50 -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
878f54b1e9 Fix: invoice supplier, disable "add" button and show error message if a 
product with no supplier price is selected
 2012-08-17 17:23:36 +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
simnandez
f20c7ea4c9 Trad: add mailminspip into ca_ES 2012-08-17 09:38:09 +02:00
Marcos García
8d6d9e8f8c PoS permission number was incorrect in admin.lang 2012-08-17 07:56:54 +02:00
Marcos García
8ab7a5e276 Improved es_ES translations 2012-08-17 07:55:28 +02:00
Marcos García
24c89ddc12 Translated message was generating an incomplete string 2012-08-17 07:05:28 +02:00
Regis Houssin
4825448ced Merge pull request #315 from marcosgdf/error-messages 
Forgot to migrate to some lines to the new error-handler
 2012-08-16 13:59:05 -07:00
Marcos García
29f2e7236a Forgot to migrate to some lines to the new error-handler 2012-08-16 21:37:33 +02:00
Regis Houssin
3468787a29 Fix: best view 2012-08-16 20:20:23 +02:00
Regis Houssin
d03eb5af4a New: add total vat field 2012-08-16 20:11:48 +02:00
Regis Houssin
97474bf77f Fix: strict mode safari 2012-08-16 19:18:24 +02:00
Stephen L
087cf0bb91 Add conditional substitution IF/ELSEIF/ENDIF for ODT 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-08-16 17:30:32 +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
7a30416124 Merge pull request #310 from marcosgdf/error-messages 
Added missing error messages in supplier & customer's orders
 2012-08-16 08:16: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
Stephen L
427da6ed5e Add optional options for mysqlnobin export method. 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-08-16 16:02:08 +02:00
Stephen L
ed990c00f5 Revert "Add conditional substitution IF/ELSEIF/ENDIF for ODT" 
This reverts commit adab15a30a.

Revert to cleanup (the conditional substitution is in another pull request)
 2012-08-16 13:54:19 +02:00
Marcos García
db5d046ee7 Applied 3.3 error management as @hregis requested 2012-08-16 13:10:14 +02: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
3941466cd3 Removed duplicated code 2012-08-16 03:55:41 +02:00
Marcos García
b6cd8b632b Improved es_ES translations 2012-08-15 19:32:26 +02:00
Marcos García
557cb35b8d Added missing translations 2012-08-15 19:17:05 +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
Stephen L
44bed57faf Fix: mysqlnobin export method now works better (avoid duplicates values errors when a number is in fact a string and foreign keys checks are always disabled when restoring) 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-08-15 18:35:37 +02:00
Marcos García
46db54da21 Renamed ECMNoDirecotyYet to ECMNoDirectoryYet 2012-08-15 16:06:53 +02:00
Marcos García
b4471a4bd7 Added missing error messages in supplier & customer's orders 2012-08-15 15:52:51 +02:00
Regis Houssin
f714897873 Fix: limit to products and services 2012-08-15 10:34:10 +02:00
Regis Houssin
fbb275ee25 Fix: remove bad fixe 2012-08-15 09:15:26 +02:00
Regis Houssin
48efabc8a4 Fix: remove deprecated function and avoid warnings 2012-08-15 09:06:36 +02:00
Regis Houssin
56c73192f1 Merge pull request #308 from marcosgdf/fix-stats 
More fixes to graph stats
 2012-08-14 22:27:11 -07:00
Regis Houssin
a8c8ef456c Merge pull request #301 from marcosgdf/translations 
Improved some translations
 2012-08-14 22:26:50 -07:00
Marcos García
37332ee040 Forgot to rename the variable 2012-08-15 01:20:53 +02:00
Marcos García
9c179699fb Added missing fr_FR translations 2012-08-14 21:33:32 +02:00
Marcos García
c8851cfca6 Fixed a problem with supplier's orders stats 
They were showing orders even if they were not approved or ordered
 2012-08-14 21:23:50 +02:00
Marcos García
764c0a50cd Fixed more average amount graph stats. They include: 
* Customer's orders
* Supplier's orders
* Customer's invoices
* Trips and expense
 2012-08-14 21:23:14 +02:00
Regis Houssin
b77a2255a0 Fix: wrong user count 2012-08-14 19:54:08 +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
Stephen L
adab15a30a Add conditional substitution IF/ELSEIF/ENDIF for ODT 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-08-14 11:38:27 +02:00
Marcos García
3e1e508bf3 Fixed bug #485 
Merged patch from J. Fernando Lagrange (lowmemory)
https://doliforge.org/tracker/?func=detail&aid=485&atid=246&group_id=144
 2012-08-14 09:57:03 +02:00
Marcos García
2f011638b1 Merge branch 'develop' into translations 2012-08-13 10:45:45 +02:00
Marcos García
770194aa91 Improved SPIP CMS translation 2012-08-13 06:28:34 +02:00
Marcos García
1b817e79b9 Improved some es_ES translations & fixed untranslated string 2012-08-13 06:26:56 +02:00
Marcos García
0b7cea6c73 Lowercased strings 2012-08-13 04:49:23 +02:00
Marcos García
2c007644ba Better es_ES translation 2012-08-13 03:11:40 +02:00
Marcos García
651d0e4eca Translated es_ES string 2012-08-11 19:14:25 +02:00
Laurent Destailleur
3b2ffb8cc0 Fix: Removed key of external modules 2012-08-11 02:06:34 +02:00
Laurent Destailleur
724ea40fa4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-11 02:00:02 +02:00
Laurent Destailleur
855bcf1b24 Fix: missing or duplicate key 2012-08-11 01:59:45 +02:00
Laurent Destailleur
0251385624 Fix: Broken feautres after migration from old versions 2012-08-10 19:13:54 +02:00
Laurent Destailleur
0176674c9f Add info for chinese 2012-08-10 04:16:31 +02:00
Laurent Destailleur
8627464596 Exclude file 2012-08-10 03:51:53 +02:00
Laurent Destailleur
4250dedf60 Better message if param not defined 2012-08-10 03:46:17 +02:00
Laurent Destailleur
8e16581e7f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-10 03:13:54 +02:00
Laurent Destailleur
628f1b17a6 Add missing key 2012-08-10 03:06:16 +02:00
Laurent Destailleur
d57a54fd04 Fix: Removed deprecated string key 2012-08-10 03:03:52 +02:00
Laurent Destailleur
84d5b75518 New: Add field tms into llx_bank 2012-08-09 19:04:39 +02:00
Laurent Destailleur
a7d9f13287 Qual: Removed deprecated columns 2012-08-09 18:45:56 +02:00
Laurent Destailleur
b3b598c068 New input reason into dictionnary. 2012-08-09 18:33:45 +02:00
Maxime Kohlhaas
d0fbca4c37 task # 326 : en_US translations :) 2012-08-09 01:51:45 +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
32a1301a92 Fix: Use correct object 2012-08-08 22:11:08 +02:00
Laurent Destailleur
2620abc6a0 Use different class for a and img 2012-08-08 20:46:50 +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
6231dd9a10 Fix: Translation 2012-08-08 00:46:08 +02:00
Marcos García
e191196156 Typo 2012-08-07 20:36:35 +02:00
Marcos García
9719c71643 Missing es_ES translation 2012-08-07 20:25:57 +02:00
Marcos García
fd65e73f7e Missing es_ES translation 2012-08-07 20:25:17 +02:00
Laurent Destailleur
2f0a88ce69 [ bug #480 ] Can't receive to stock with strict mode 2012-08-07 19:32:51 +02:00
Laurent Destailleur
da484bdaa5 Fix: Missing desc field 2012-08-07 19:09:41 +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
040c675de6 Fix: Do not overwrite global $user information 2012-08-07 14:54:56 +02:00
Laurent Destailleur
068c536741 Fix: Delete all files (PROV* when validating. 2012-08-07 14:24:54 +02:00
Laurent Destailleur
e47accd87b Qual: Removed deprecated code 2012-08-07 14:13:59 +02:00
Laurent Destailleur
fac878ca69 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-08-07 13:13:30 +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
Regis Houssin
5564421e3f Fix: update method return $this->error not $this->errors 2012-08-07 12:00:22 +02:00
Regis Houssin
71a4a2b7f9 Fix: dol_htmloutput_events() already loaded in footer 2012-08-07 11:48:28 +02:00
Laurent Destailleur
edbfd7d4f8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-08-07 11:33:53 +02:00
Laurent Destailleur
5d9f16ca20 New: More surface control on stock correction page 2012-08-07 11:33:11 +02:00
Christophe Battarel
cbd54291b1 also take lines without buying_price in commissions 2012-08-07 09:46:26 +02:00
Marcos García
d5ce19840c Added missing translations 2012-08-06 21:22:45 +02:00
Regis Houssin
f814e4e25f Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-06 20:42:27 +02:00
Regis Houssin
f6a4277525 Fix: remove unused file and missing print 2012-08-06 20:38:03 +02:00
Laurent Destailleur
1e28904d56 New: task #185 : Can input amount when correcting stock to recalculate 
PMP.
 2012-08-06 19:41:03 +02:00
Laurent Destailleur
0ad8f31899 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-08-06 19:24:40 +02:00
Laurent Destailleur
49f8f07737 Start to work on bug [ bug #251 ] and [ bug #260 ]. 2012-08-06 19:22:14 +02:00
Regis Houssin
67d90d9de2 Merge pull request #292 from atm-maxime/mko185 
Mko185
 2012-08-06 10:03:59 -07:00
Regis Houssin
58878cdb6f Fix: update jquery fileupload 2012-08-06 18:43:34 +02:00
Maxime Kohlhaas
c2b38e8415 task #185 2012-08-06 18:11:00 +02:00
Regis Houssin
d830041441 Fix: missing object 2012-08-06 17:43:14 +02:00
Maxime Kohlhaas
e8a3af017e task #185 : Can input HT amount when correcting stock to recalculate PMP 2012-08-06 17:10:55 +02:00
Regis Houssin
1b2e6aa5e4 Fix: remove draft status if invoice is validated 2012-08-06 09:13:50 +02:00
Regis Houssin
a0ac6873ed Fix: use doliforge instead savannah 2012-08-06 08:17:36 +02:00
Regis Houssin
e140724738 Fix: avoid warning 2012-08-06 08:13:58 +02:00
Laurent Destailleur
816e317dd2 Fix into categorie functions 2012-08-05 23:58:42 +02:00
Laurent Destailleur
e53ae6eea2 Fix: W3C 2012-08-05 21:59:45 +02:00
Laurent Destailleur
76cdb809cc Fix: syntax error 2012-08-05 21:30:40 +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
Laurent Destailleur
9e6a9f1b12 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-05 19:08:49 +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
400621135b Fix: indentation 2012-08-05 18:33:11 +02:00
Regis Houssin
25662f9ecc Fix: compatibility with jquery fileupload 2012-08-05 18:32:59 +02:00
Laurent Destailleur
7764cfec83 Trans 2012-08-05 16:43:39 +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
990da41955 Qual: Removed bad herit 2012-08-05 14:56:20 +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
Laurent Destailleur
9fef649a7c Removed useless file 2012-08-05 14:06:21 +02:00
Regis Houssin
64e32258c2 Merge pull request #291 from marcosgdf/translations 
Translations
 2012-08-04 22:53:29 -07:00
Laurent Destailleur
b82fb7a7d9 Fix: exit code when upgrade is ran from command line 2012-08-05 00:49:28 +02:00
Marcos García
c76cdd74e7 es_ES typos and missing translation 2012-08-04 14:52:44 +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
Regis Houssin
d883c135e0 Merge pull request #290 from marcosgdf/coding-style 
Removed duplicated code
 2012-08-03 23:16:07 -07:00
Laurent Destailleur
7f218bd6ba Better error management 2012-08-04 02:20:51 +02:00
Marcos García
189c3c94da Removed duplicated code 2012-08-04 02:15:39 +02:00
Laurent Destailleur
377b1716ef Fix: permission execute on perl script 
Fix: Checkstyle
 2012-08-04 00:17:34 +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
Laurent Destailleur
1307c77900 Fix: Project validation 2012-08-03 19:05:20 +02:00
Laurent Destailleur
9f5fbe78c9 Fix: Bad fix 2012-08-03 18:50:24 +02:00
Laurent Destailleur
5dc6f6aec8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-08-03 17:28:52 +02:00
Laurent Destailleur
a29205cea9 Fix: tr_TR 2012-08-03 17:09:07 +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
236dbb8598 Merge pull request #287 from marcosgdf/translations 
Little fixes to translations
 2012-08-03 05:28:41 -07:00
Marcos García
5b8e8ff11b ECM Area page title translation didn't exist 2012-08-03 14:24:02 +02:00
Laurent Destailleur
6cf97a7317 Clean dead code 2012-08-03 14:18:48 +02:00
Marcos García
0e108226da FeatureNotYetAvailable wasn't being translated 2012-08-03 14:05:28 +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
fdd781f6fe Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-08-03 12:04:28 +02:00
Regis Houssin
286854bf2c Fix: [bug #478] Can access pages belonging to disabled modules 2012-08-03 11:56:42 +02:00
Laurent Destailleur
d4a19f0674 Fix: Removed warning 2012-08-03 10:56:50 +02:00
Laurent Destailleur
18944a3d9b Merge branch 'develop' of https://eldy:ld101010-gb@github.com/Dolibarr/dolibarr.git into develop 2012-08-03 10:29:00 +02:00
Laurent Destailleur
ff0d24a0dc Fix: Remove warning 2012-08-03 10:26:39 +02:00
Laurent Destailleur
1e13a7cf13 Merge pull request #285 from simnandez/develop 
Develop
 2012-08-02 07:46:58 -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
9451edafd8 Fix: bad link and uniformize code 2012-08-01 18:40:47 +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
2dcb158915 Fix: strict mode again 2012-08-01 13:32:50 +02:00
Regis Houssin
c558f2206c Fix: strict mode pleasure 2012-08-01 13:30:38 +02:00
Regis Houssin
29fea7bbf4 Fix: regression (multicompany) 2012-08-01 13:03:41 +02:00
Regis Houssin
da44fa7186 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-01 08:23:54 +02:00
Regis Houssin
902f1c7e71 Fix: typo 2012-08-01 08:23:37 +02:00
Laurent Destailleur
4b3aba919f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-31 23:06:12 +02:00
Marcos García
9d422350a5 Translated some comments 2012-07-31 14:41:15 +02:00
Laurent Destailleur
8d031900f9 [ bug #464 ] Payment form should allow to add transmitter for bank transfers 2012-07-31 13:40:38 +02:00
simnandez
47335f0613 Trad: Improve translations 2012-07-31 09:29:19 +02:00
simnandez
40a57f63cb Trad: Improve translations 2012-07-31 09:26:35 +02:00
Regis Houssin
fcae6f8811 Merge pull request #284 from marcosgdf/php-error 
Fixed an error that I introduced in a previous commit...
 2012-07-30 23:36:08 -07:00
Marcos García
dbe2fa55df es_ES translation typo 2012-07-31 01:18:32 +02:00
Marcos García
315896c702 Fixed img_up 2012-07-31 01:17:21 +02:00
Marcos García
c62ac71e03 Typo in es_ES translation 2012-07-31 01:05:03 +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
fc012a394c Duplicated space 2012-07-31 00:44:55 +02:00
Marcos García
e0325f3df1 Missing es_ES translations 2012-07-31 00:36:42 +02:00
Laurent Destailleur
2f19fd9612 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-31 00:07:19 +02:00
Laurent Destailleur
acad2191d5 Fix: Style 2012-07-31 00:06:39 +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
Laurent Destailleur
a996e8f98a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-30 21:44:21 +02:00
Laurent Destailleur
190f005b68 New: ECM module is full Ajax 2012-07-30 21:44:00 +02:00
Laurent Destailleur
2191a4dc73 Fix: use ENGINE=innodb instead of type=innodb 2012-07-30 21:43:40 +02:00
Regis Houssin
4f1814d486 Merge pull request #280 from marcosgdf/translations 
Translations
 2012-07-30 11:47:10 -07:00
Marcos García
237d7b744c Including other.lang in files using FeaturesSupported string, also removed duplicated code 2012-07-30 20:39:47 +02:00
Marcos García
a71840bbd9 Revert "Moved FeaturesSupported string from other.lang to admin.lang as it is only used in admin pages" 
This reverts commit 0e952521e1.
 2012-07-30 20:29:54 +02:00
Marcos García
fb95a0ed16 Made corrections that @hregis told me 2012-07-30 20:29:39 +02:00
FHenry
bf2d0ea82a correct checkstyle 2012-07-30 20:15:18 +02:00
FHenry
af91a7185a Checkstyle (from hudson) 2012-07-30 20:11:55 +02:00
Marcos García
7bbfe9c29b Fixed es_ES typo 2012-07-30 20:09:35 +02:00
Marcos García
0e952521e1 Moved FeaturesSupported string from other.lang to admin.lang as it is only used in admin pages 2012-07-30 19:45:51 +02:00
Marcos García
e81a8b1d2c Merge branch 'develop' into translations 2012-07-30 19:04:53 +02:00
Regis Houssin
e44fd4885d Fix: change the last $DB to $db 2012-07-30 18:43:49 +02:00
Marcos García
8f678cebec Added missing translation 2012-07-30 17:33:32 +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
Regis Houssin
914087b92e Merge pull request #275 from marcosgdf/translations 
Minor fixes
 2012-07-30 03:03:54 -07: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
Regis Houssin
4750406eba Merge pull request #277 from marcosgdf/phpinfo-improvement 
Phpinfo improvement
 2012-07-29 22:20:21 -07:00
Regis Houssin
a7b1b23461 Merge pull request #276 from marcosgdf/margin-typo 
Fixed untranslated string and broken image in Margins module
 2012-07-29 22:19:03 -07:00
Marcos García
20bf07a3e2 Typo 2012-07-30 03:52:48 +02:00
Marcos García
db2cab0e04 Better parsing, replacing preg_replace for str_replace for easy replacements 2012-07-30 03:51:40 +02:00
Marcos García
a0eb690d0f Fixed untranslated string and broken image 2012-07-30 03:28:16 +02:00
Marcos García
c627e73c9d Realized that es_ES looks better this way 2012-07-30 03:21:33 +02:00
Marcos García
d1cbf4f944 Fixed BIG es_ES translation problem with donations module 
Fixed some es_ES and en_US typos
There was a string that wasn't available for translation
 2012-07-30 03:18:17 +02:00
Marcos García
35f2e731e1 PHP upper-cased + checkstyle 2012-07-29 22:43:54 +02:00
Marcos García
8910fa46da Corrected English translation and added Spanish missing translation 2012-07-29 22:40:11 +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
Marcos García
e26b53e8c5 Fixed a PHP fatal error warning in remisecheque.class.php 2012-07-29 21:43:19 +02:00
Laurent Destailleur
a429a930d0 Fix: Uniformize code and PHPUnit tests 2012-07-29 20:07:03 +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
Laurent Destailleur
6739d5fd8d Fix: Add missing error message 2012-07-29 16:51:16 +02:00
Regis Houssin
28851b46c4 Fix: remove duplicate code 2012-07-29 16:44:19 +02:00
Regis Houssin
30ca31de6c Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-29 16:12:05 +02:00
Regis Houssin
a64723ea74 Fix: replace with new event message system 2012-07-29 16:11:52 +02:00
Laurent Destailleur
56e9ffb685 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-29 15:55:59 +02:00
Laurent Destailleur
8c5e8e0690 Fix: [ bug #466 ] Module MailmanSpip 2012-07-29 15:55: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
Laurent Destailleur
0ee08418cc New: Add test on mandatory field 2012-07-29 13:47:42 +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
b37a1b3daa Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-29 08:27:02 +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
f2239c897e Merge pull request #273 from marcosgdf/translations 
Fixed some minor es_ES translation typos
 2012-07-28 13:29:48 -07: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
Marcos García
535e6f1756 es_ES typos 2012-07-28 22:16:39 +02:00
Regis Houssin
75588c2eb3 Merge pull request #272 from marcosgdf/backtolist-links 
Created BackToList links
 2012-07-28 13:15:42 -07:00
Marcos García
ec36ffd73c Missing expeditions and stocks BackToList links 2012-07-28 22:14:53 +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
Marcos García
04c34b0042 BackToList links in Contacts section 2012-07-28 21:54:36 +02:00
Marcos García
9dc38f4382 Created rest of BackToList links 2012-07-28 21:49:47 +02:00
Marcos García
2eeaad1352 BackToList links in Financial section 2012-07-28 21:22:59 +02:00
Marcos García
32a3477ccb BackToList links in Interventions section 2012-07-28 21:05:00 +02:00
Marcos García
b3b33b7aca BackToList links in Contracts section 2012-07-28 20:59:57 +02:00
Marcos García
90963ca84a BackToList links in Client orders section 2012-07-28 20:54:07 +02:00
Marcos García
472397d5c2 BackToList links in Supplier order section 2012-07-28 20:47:12 +02:00
Regis Houssin
1816886135 Merge pull request #271 from marcosgdf/translations 
Removed space before colon
 2012-07-28 11:30:25 -07:00
simnandez
8a19946e4a Trad: Commissions and margins 
Conflicts:
	htdocs/langs/fr_FR/margins.lang
 2012-07-28 20:22:38 +02: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
af0b36c1d1 Merge pull request #269 from marcosgdf/translations 
Fixed some typos in es_ES and allowed some strings to be translated
 2012-07-28 11:16:20 -07:00
Marcos García
de7595922e Fixed some typos in es_ES and allowed some strings to be translated 2012-07-28 19:53:13 +02:00
Regis Houssin
9a80f0351d New: add phpmailer class 2012-07-28 19:11:05 +02:00
Regis Houssin
bdc9dbfb01 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-28 19:05:28 +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
simnandez
b03fd00c3a Trad: Export de données dangereux 2012-07-28 18:53:05 +02:00
Regis Houssin
49bacc6fda Merge pull request #267 from marcosgdf/trans-and-link-fixes 
Fixed es_ES translations and some BackToList links
 2012-07-28 09:36:28 -07:00
Regis Houssin
e7a994360e Merge pull request #266 from marcosgdf/typo-spanish-translation 
Typo in es_ES translation
 2012-07-28 09:35:28 -07:00
Regis Houssin
1dd14d35f7 Fix: add null value in class method 2012-07-28 18:32:54 +02:00
Marcos García
241241bf0a Fixed some problems with translations 2012-07-28 17:34:21 +02:00
Marcos García
706b637389 Removed unused BackToList link params 2012-07-28 17:20:17 +02:00
Marcos García
f9dbc6d9be Merge branch 'develop' into typo-spanish-translation 
Conflicts:
	htdocs/langs/es_ES/products.lang
 2012-07-28 16:31:34 +02:00
Marcos García
bb8dd6ded6 Fixed 2 fatal errors in commande/fiche.php and a SQL problem too 2012-07-28 16:22:01 +02:00
Regis Houssin
2a3a8f5aa5 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-28 12:35:47 +02:00
Regis Houssin
251640561f Fix: strict mode happy hour 2012-07-28 12:35:11 +02:00
Laurent Destailleur
859c6cee97 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-28 12:32:06 +02:00
Laurent Destailleur
160997cbbe Fix: Bad test 2012-07-28 12:31:37 +02:00
Regis Houssin
a157327859 Fix: strict mode paradise 2012-07-28 11:28:37 +02:00
Regis Houssin
3390a514e1 Fix: include wrong class 2012-07-28 09:57:04 +02:00
Regis Houssin
1e07ed6af6 Fix: broken link 2012-07-28 09:54:47 +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
Regis Houssin
5fb22d689b Fix: best practice 2012-07-28 09:10:09 +02:00
Laurent Destailleur
bf94d05293 New: Add great britain provinces 2012-07-28 03:12:34 +02:00
Laurent Destailleur
7883124958 New: [ task #454 ] Add "No category" into filters on category 2012-07-28 00:53:51 +02:00
Marcos García
c14d9ce13b Typo in es_ES translation 2012-07-28 00:00:46 +02:00
Laurent Destailleur
eb79646315 Fix: restore correct test (empty instead of ! isset) 2012-07-27 23:30:23 +02:00
Laurent Destailleur
a2e745fab6 Fix: Function return was missing in some case. Save bug of empty 
category.
 2012-07-27 23:21:22 +02:00
Marcos García
2204c09e5a Applied commits 16-22 2012-07-27 23:04:05 +02:00
Marcos García
a6c8838b8f Applied patches 9-15 2012-07-27 21:27:03 +02:00
Laurent Destailleur
bd20ab3500 New: Auto check box on page to edit interface options of user. 2012-07-27 20:47:17 +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
Laurent Destailleur
42d6ed91f7 Fix: Closing tab 2012-07-27 18:41:52 +02:00
Marcos García
5fd7fcb6c4 Applied commits 1-8 2012-07-27 18:40:06 +02:00
Laurent Destailleur
56ced6e5f0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-07-27 16:04:28 +02:00
Laurent Destailleur
0b048ebb94 [ bug #40 ] Export de donnes dangereux 2012-07-27 16:03:20 +02:00
Regis Houssin
6a69b55e5e Fix: tabulation 2012-07-27 14:10:56 +02:00
Raphaël Doursenaud
9ffb6317cf Fix: Allows to use a comma decimal separator in supplier invoices 
payments
 2012-07-27 13:54:16 +02:00
Regis Houssin
20ed6bd5c5 Fix: Bug #460 - Wrong entity assignment when creating a warehouse 2012-07-26 20:52:05 +02:00
Regis Houssin
79181f9183 Fix: add external user filter 2012-07-26 18:24:54 +02:00
Regis Houssin
b2317fd3ee Fix: external user confidentiality 2012-07-26 18:11:06 +02:00
Regis Houssin
5318fb54d5 Fix: bad path 2012-07-26 17:07:10 +02:00
Regis Houssin
b83fbf981d Fix: problem with double quote 2012-07-26 14:33:25 +02:00
Regis Houssin
a6758c2557 Fix: use span instead div for align image warning 2012-07-26 11:34:43 +02:00
Regis Houssin
28a98f6bd9 Fix: wrong action 2012-07-26 10:45:19 +02:00
Regis Houssin
68196e638a Fix: compatibility with edit in place 2012-07-26 09:32:54 +02:00
Laurent Destailleur
ac81e1732e Fix: bad field name 2012-07-26 03:01:15 +02:00
Laurent Destailleur
97906568e3 Typo fix 2012-07-26 02:57:35 +02:00
Laurent Destailleur
ef86d8e2dc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-25 17:39:44 +02:00
Laurent Destailleur
9392cf2832 Update translation for tr_TR 2012-07-25 17:39:17 +02:00
Laurent Destailleur
105e91dfea Fix: Redirect after delete to correct page 2012-07-25 15:03:06 +02:00
Regis Houssin
e3a3dd0454 Fix: it's for margin module 2012-07-25 12:53:02 +02:00
Laurent Destailleur
126979efe1 Fix: All "isset" must not be replaced by "GETPOST". If isset is used to 
know if value is defined (and not to know if value is null), we must
keep the isset.
 2012-07-25 12:25:45 +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
ea54523181 Checkstyle 2012-07-25 11:40:23 +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
de621f0567 Fix: Restore compatibility. Try to isolate "charges" feature with 
a condition (i did not understand what it means and goal, i'm afraid
other users should not understand too).
 2012-07-25 11:32:48 +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
Laurent Destailleur
b47ced7507 Fix: syntax error 2012-07-25 10:56:30 +02:00
Regis Houssin
e12604cb71 Fix: avoid warning and strict mode story 2012-07-25 09:09:56 +02:00
Regis Houssin
8e953a6858 Fix: external modules workflow compatibility 2012-07-24 20:18:37 +02:00
Regis Houssin
f8f50a722d Fix: patch of Terry (language) 2012-07-24 18:38:35 +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
FHenry
b3ca737662 remove useless parameters 2012-07-24 17:33:26 +02:00
Laurent Destailleur
24c54ccaf1 Start to work on bug export 2012-07-24 16:19:46 +02:00
FHenry
a2b6abcb85 Fix nb mailling message receive according toher status than error or not 
send
 2012-07-24 14:33:27 +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
FHenry
6fc9bf5143 Correct mail tag __UNSUSCRIBE__ to __UNSUBSCRIBE__ 2012-07-24 10:18:17 +02:00
Regis Houssin
812d02ebe0 Fix: strict mode and $mesgs 2012-07-23 22:04:06 +02:00
Regis Houssin
a4f35bbfd5 Fix: uniformize $mesgs 2012-07-23 21:45:22 +02:00
Regis Houssin
2035eb0b14 Fix: strict mode mini 2012-07-23 21:40:34 +02:00
Regis Houssin
eba0db736e Fix: try to use $mesgs (array) for stock all messages and 
$_SESSION['dol_message'] for specific message when a page is reloading
 2012-07-23 21:31:10 +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
9cf088560f Fix: syntax error 2012-07-23 16:47:16 +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
3fe8b5bc58 Change-Id: Ia9f609c8a1264d245ff5074b981305f7d1792aef 2012-07-23 11:01:52 +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
0301e35a44 Merge pull request #256 from marcosgdf/task-195 
Completed Task #195
 2012-07-23 01:37:37 -07: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
1c17767dda Fix: Send instructions must be into core page. 2012-07-22 23:22:40 +02:00
Laurent Destailleur
0eb9b105c9 Fix: Translation missing 2012-07-22 23:07:25 +02:00
Laurent Destailleur
68e619fb00 Fix: escape for create command 2012-07-22 21:50:08 +02:00
Marcos García
568db22649 Renamed fk_methode_commande to fk_input_method 2012-07-22 16:58:37 +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
Marcos García
e6a192ba87 Renamed fk_demand_reason to fk_input_reason 2012-07-22 16:53:02 +02:00
Marcos García
9eb9fe6d2c Moved bookmark translations from other.lang to bookmarks.lang, also 
removed unused translations

Conflicts:
	htdocs/langs/tr_TR/bookmarks.lang
 2012-07-22 16:44:16 +02:00
Laurent Destailleur
474a67a4a4 Fix: picto 2012-07-22 16:11:23 +02:00
Laurent Destailleur
0d6baa4288 Qual: Enhance codesniffer setup 2012-07-22 14:08:05 +02:00
Laurent Destailleur
c41c5bf797 New: Add help on feature to use it with caution 2012-07-22 13:36:28 +02:00
Laurent Destailleur
72d9f7348c Fix: Missing lang loading 2012-07-22 12:13:53 +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
9f3f3703e3 Fixed Catalan typos too 2012-07-19 23:44:36 +02:00
Marcos García
7b478dbb35 Contracts box name wasn't being translated 2012-07-19 23:44:28 +02:00
Marcos García
6039c6f420 Added missing translation and fixed some typos 2012-07-19 23:44:02 +02:00
Marcos García
8233a26422 Fixed some spanish & catalan translations 2012-07-19 23:43:41 +02:00
Regis Houssin
b121a01ef8 Merge pull request #247 from cbattarel/marges 
Margin module
 2012-07-19 10:46:24 -07:00
Marcos García
44a6236b7d Replaced "Seconds" for "seconds" 
Conflicts:
	htdocs/admin/proxy.php
 2012-07-19 19:43:15 +02:00
Raphaël Doursenaud
4f0d43bbc8 French wording 
Réception -> Traitement en cours
 2012-07-19 19:33:05 +02:00
Raphaël Doursenaud
bba9aa4bb4 French spelling 
Chiffre d'affaire -> Chiffre d'affaires
 2012-07-19 19:32:57 +02:00
Raphaël Doursenaud
04a975fbad Text: Chiffrer 2012-07-19 19:32:43 +02:00
Marcos García
319cf18b3b The tab Documents of the Contracts module wasn't being translated 2012-07-19 19:29:43 +02:00
simnandez
7f33e41113 Trad: Better translation 2012-07-19 19:29:30 +02: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
Christophe Battarel
8e8fd72459 correct margin infos display on order 2012-07-19 16:25:40 +02:00
Christophe Battarel
34132de71d add charges to supplier prices 2012-07-19 15:36:25 +02:00
Laurent Destailleur
f5b58b6f12 Fix: Missing fields into insert from webservice 2012-07-19 14:26:02 +02:00
Christophe Battarel
55d547348a margin management for invoices 2012-07-19 11:07:50 +02:00
Christophe Battarel
c8e211c864 add missing include 2012-07-19 10:48:01 +02:00
Christophe Battarel
d32091120b margin management for orders 2012-07-19 10:26:26 +02:00
Christophe Battarel
b5c92c7b46 correction in getlinesarray 2012-07-19 10:15:59 +02:00
Christophe Battarel
019b857784 correct display of margin resume table 2012-07-19 09:55:43 +02:00
simnandez
5b3c50dad2 Trad: Add missing translation 2012-07-19 09:13:39 +02:00
Marcos García
98dfa8cd2e Fixed bug https://doliforge.org/tracker/?func=detail&aid=456&atid=246&group_id=144 2012-07-19 09:12:41 +02:00
Laurent Destailleur
1d89c172d0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-07-18 22:41:06 +02:00
Christophe Battarel
9a7935075c correct margin informations when buy_price at zero 2012-07-18 17:29:32 +02:00
Christophe Battarel
8e2fee02df correct default definition for buy_price_ht in migration script 2012-07-18 17:17:00 +02:00
Christophe Battarel
f0f52270a5 adapt to new structure 2012-07-18 17:13:29 +02:00
Christophe Battarel
efba33eb13 adapt to new module structure 2012-07-18 17:00:56 +02:00
Christophe Battarel
411bb993b5 correct path to price.lib.php 2012-07-18 16:49:45 +02:00
Christophe Battarel
bd05495375 correct syntax error 2012-07-18 16:45:34 +02:00
Christophe Battarel
34022de1de correction of syntax error in tpl 2012-07-18 16:43:02 +02:00
Christophe Battarel
c5fe895dce adaptation to new module structure 2012-07-18 16:17:33 +02:00
Christophe Battarel
c12c8bd0bb update margin modules to core module 2012-07-18 16:13:29 +02:00
Christophe Battarel
3844a77395 correct typing bugs 2012-07-18 16:06:36 +02:00
Christophe Battarel
50c2a65b6a add margin infos to templates 2012-07-18 16:01:54 +02:00
Christophe Battarel
1de9dc15bf add margin module 2012-07-18 15:52:15 +02:00
Christophe Battarel
c0ac8c9ae1 fetch margin infos on line object 2012-07-18 15:50:37 +02:00
Christophe Battarel
316f6ce09c add margin infos to commonobject.class.php 2012-07-18 15:26:33 +02:00
Christophe Battarel
58262034cf add extra parameters to control combo in form_thirdparty like in select_company 2012-07-18 15:22:45 +02:00
Christophe Battarel
0cdf208f3d trigger change event when updating item value 2012-07-18 15:17:04 +02:00
Christophe Battarel
122fc5eaa7 update propales for margins 2012-07-18 15:15:54 +02:00
Christophe Battarel
a37707f96f updata database for margin module 2012-07-18 11:39:41 +02:00
Laurent Destailleur
ba25905926 New: [ task #454 ] Add "No category" into filters on category 
combo for product list
 2012-07-18 00:20:33 +02:00
Laurent Destailleur
9116db986f Fix: Restore button to edit products. Fix: the template to use for notes is dolibarr_notes. 2012-07-17 19:45:22 +02:00
Laurent Destailleur
7d9a4f2441 Make code simpler 2012-07-17 19:24:50 +02:00
Laurent Destailleur
73b17dc4c5 New: Make things more clear. 2012-07-17 15:28:34 +02:00
Laurent Destailleur
0021f7d98e New: Use a better format for workflow array: 
- allow more complex permissions/conditions
- allow to define order of options
- can define workflow option not using two modules (can use only one, of
threee or more...)
 2012-07-17 15:27:36 +02:00
Laurent Destailleur
86c59a2460 Better translation 2012-07-17 15:03:04 +02:00
Laurent Destailleur
1831b46bae Fix: Do not show if module disabled 2012-07-17 14:30:10 +02:00
Laurent Destailleur
393f407341 Update turkish language files 2012-07-17 02:33:14 +02:00
Laurent Destailleur
d07e68e12f Fix: Combo list of warehouse not saved. 
Fix: Validate of shipment in error
when using not predefined products.
 2012-07-17 01:22:19 +02:00
Laurent Destailleur
06926e626a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-07-13 17:19:11 +02:00
Regis Houssin
7122b91203 Merge pull request #242 from simnandez/develop 
Fix: Bad local taxes if price base type is TTC
 2012-07-13 07:29:12 -07:00
Regis Houssin
4f458c01f4 Fix: missing entity filter 2012-07-13 16:23:47 +02:00
Laurent Destailleur
035b2d201b Fix: Translation 2012-07-13 16:17:30 +02:00
Laurent Destailleur
a953dbd01c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-07-13 16:13:24 +02:00
simnandez
b8338425f4 Trad: Add missing translations 2012-07-13 15:46:42 +02:00
Laurent Destailleur
ae08c49d13 Fix: due date and unit price into web service 2012-07-13 15:32:38 +02:00
simnandez
606674d8c8 Fix: Bad local taxes if price base type is TTC 
Conflicts:
	htdocs/core/lib/price.lib.php
 2012-07-13 15:28:25 +02:00
Regis Houssin
f16d204ca2 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-13 14:45:12 +02:00
Regis Houssin
221ecafe07 Fix: use click2dial only for phone tel 2012-07-13 14:45:00 +02:00
Laurent Destailleur
3fafecffbc Fix: field not saved into invoice creation 2012-07-13 14:06:51 +02:00
Regis Houssin
a1c86f52d7 Fix: strict mode holidays 2012-07-13 11:40:06 +02:00
Regis Houssin
77b9718473 Fix: strict mode street 2012-07-13 10:15:47 +02:00
Regis Houssin
94b7aed116 Fix: strict mode avenue 2012-07-12 19:14:13 +02:00
Laurent Destailleur
5a57070f6f Fix: Works whatever is number of lines into invoice 2012-07-12 18:12:02 +02:00
Laurent Destailleur
ee8b80813a Fix: Date not converted correctly when using web service 2012-07-12 17:07:56 +02:00
Laurent Destailleur
bea1a50e2c Fix: Phone not saved when using web service 2012-07-12 14:36:08 +02:00
Laurent Destailleur
f7eebc0502 Fix: Phone not saved when using web service 2012-07-12 11:58:44 +02:00
Regis Houssin
e1b0d183e4 Fix: add commonorder and commoninvoice classes 2012-07-11 18:13:41 +02:00
Regis Houssin
e18d3c6e18 Fix: strict mode again 2012-07-11 15:55:56 +02:00
Regis Houssin
6935598ced Fix: optimization 2012-07-11 12:05:43 +02:00
Regis Houssin
5e020cd178 Fix: use array for external module 2012-07-11 11:23:32 +02:00
Regis Houssin
b53d108c50 Fix: uniformize code 2012-07-11 10:14:56 +02:00
Regis Houssin
ff0668e908 Fix: strict mode way 2012-07-10 22:10:12 +02:00
Regis Houssin
28ccc43125 Fix: avoid another warning 2012-07-10 20:45:07 +02:00
Regis Houssin
71ad968c03 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-10 18:57:38 +02:00
Regis Houssin
4291db4a93 Fix: strict mode 2012-07-10 18:57:27 +02:00
Regis Houssin
b4617ee6cb Fix: bad test 2012-07-10 18:57:09 +02:00
Laurent Destailleur
73c331a8e1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-07-10 17:52:09 +02:00
Laurent Destailleur
df31ae2b0e New: Add canadian provinces 2012-07-10 17:51:29 +02:00
Laurent Destailleur
d5e8c2bfbb Merge pull request #238 from simnandez/develop 
Trad: Add missing translations
 2012-07-10 07:29:33 -07:00
Regis Houssin
60dc11872e Fix: for multicompany transverse mode 2012-07-10 13:35:22 +02:00
Regis Houssin
226caf0152 Fix: and again, and again, and again... (strict mode) 2012-07-10 13:20:53 +02:00
Regis Houssin
6da69208d4 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-10 11:46:18 +02:00
Regis Houssin
41144643eb Fix: avoid warning php strict mode 2012-07-10 11:45:38 +02:00
Laurent Destailleur
20c1e29d72 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-07-10 11:09:49 +02:00
Laurent Destailleur
6f02fc841d Renamed type 2012-07-10 11:07:40 +02:00
Regis Houssin
41789458c5 Fix: warning again and again... 2012-07-09 18:09:44 +02:00
Regis Houssin
7fac86a5af Fix: avoid warnings 2012-07-09 12:54:27 +02:00
Regis Houssin
66b2f630ac Fix: big avoid strict mode errors 2012-07-09 12:31:21 +02:00
Regis Houssin
1f98c2cfc4 Fix: add possibility to use strict mode for debugging 2012-07-09 10:24:33 +02:00
Regis Houssin
1842fd3058 Fix: restore parameters 2012-07-09 10:10:21 +02:00
Regis Houssin
cd7bf41ae0 Fix: php 5.4 strict mode warning 2012-07-09 10:08:56 +02:00
Regis Houssin
7fe53c4dcf Fix: object already defined in constructor 2012-07-08 23:26:28 +02:00
Regis Houssin
07ddd75b99 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-08 23:22:36 +02:00
Regis Houssin
887f210618 Fix: avoid warning with php 5.4 and strict mode 2012-07-08 23:22:22 +02:00
Regis Houssin
320fe741cb Fix: avoid warning with php 5.4 and strict mode 2012-07-08 22:43:06 +02:00
Laurent Destailleur
be04878d4d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-07-08 16:54:27 +02:00
Laurent Destailleur
f09dfe8864 Fix: removed warning 2012-07-08 16:54:08 +02:00
Regis Houssin
10160d99a7 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-08 15:51:02 +02:00
Regis Houssin
65e0f18449 Fix: view image object 2012-07-08 15:50:27 +02:00
Laurent Destailleur
d0943be80d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-07-08 14:30:27 +02:00
Laurent Destailleur
fb1034c8a7 Fix: sort in ecm module 2012-07-08 14:30:05 +02:00
Regis Houssin
c25254e7d1 Fix: doc 2012-07-08 14:22:11 +02:00
Regis Houssin
2804ef2252 New: classify billed order if invoice billed (workflow 
manager)
 2012-07-08 14:18:40 +02:00
Laurent Destailleur
c9a2c70110 Fix: must use utf8 2012-07-08 13:57:51 +02:00
Laurent Destailleur
9c5e98aad7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-07-08 13:30:39 +02:00
Laurent Destailleur
616f8ddaa8 New: Add a repair function to restore data into ecm_directories table 
that was not sanitized.
 2012-07-08 13:30:21 +02:00
Regis Houssin
b56d1ac735 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-08 13:19:56 +02:00
Regis Houssin
d1e80afe62 Fix: move "classify billed propal with order" in workflow manager 2012-07-08 13:19:13 +02:00
Laurent Destailleur
fad501d777 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-07-08 12:43:11 +02:00
Laurent Destailleur
0d12536b56 Fix: ecm 2012-07-08 12:42:33 +02:00
Regis Houssin
680fd32d23 Fix: missing parameters 2012-07-08 12:24:13 +02:00
Regis Houssin
3ca844b3df Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-08 12:19:12 +02:00
Regis Houssin
69ebda8ddb Fix: regression corrected 2012-07-08 12:18:29 +02:00
Laurent Destailleur
d0f7acb4e1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-07-07 20:12:23 +02:00
Laurent Destailleur
1e25ccac3e Update translation 2012-07-07 19:47:27 +02:00
Regis Houssin
05b7dfd97b Fix: compatibility with multicompany and transverse mode 2012-07-07 15:21:52 +02:00
Regis Houssin
714fe81abf Fix: getpost error 2012-07-07 12:50:56 +02:00
Regis Houssin
fa8841c53f Fix: missing object 2012-07-07 12:26:46 +02:00
Regis Houssin
7e2469618e Change-Id: I5f8bcf59cf2fc0d902edb4d61f8c20a2880765a2 2012-07-07 12:21:09 +02:00
Regis Houssin
ba45953223 Fix: more bugs with multicompany 2012-07-07 11:01:05 +02:00
Regis Houssin
1c545c4161 Fix: problem with template 2012-07-07 11:00:53 +02:00
Regis Houssin
5ad84406a2 Fix: security 2012-07-07 07:58:59 +02:00
Regis Houssin
ca62c3dba8 Fix: compatibility with multicompany 2012-07-06 20:50:24 +02:00
Regis Houssin
3bfd9182e0 Fix: uniformize code 2012-07-06 13:43:59 +02:00
Laurent Destailleur
d5060adf9d Fix: Error if curl not available 2012-07-06 11:35:03 +02:00
Laurent Destailleur
2500faa65d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-07-06 11:17:01 +02:00
Laurent Destailleur
6c433db348 New: Update turkish translation 2012-07-06 11:14:45 +02:00
Regis Houssin
9fa6f43643 Fix: bad link and uniformize code 2012-07-06 10:22:37 +02:00
Regis Houssin
dfe7b9ecbb Fix: price field is obsolete 2012-07-06 09:52:20 +02:00
Regis Houssin
46d2c1f730 Fix: wrong links 2012-07-05 16:04:03 +02:00
Laurent Destailleur
f9cef80942 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-07-05 15:48:02 +02:00
Laurent Destailleur
059c5bf632 New: Add ext ref 2012-07-05 15:44:01 +02:00
Regis Houssin
1968a8079a Fix: wrong link 2012-07-05 15:39:32 +02:00
Regis Houssin
83a228265c New: add possibility to use hooks for view linked objects block 2012-07-05 15:02:11 +02:00
Regis Houssin
ed3439d8ee Fix: add test if curl is installed 2012-07-04 17:00:29 +02:00
Regis Houssin
30989fc6c3 Fix: lines delimiter 2012-07-04 16:55:14 +02:00
Regis Houssin
293eab7676 New: add possibility to hide vat only if null 2012-07-04 16:52:08 +02:00
Laurent Destailleur
59bd8ada73 New: Show root install param only if required. 2012-07-04 10:23:59 +02:00
Laurent Destailleur
571041e5d5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-07-04 10:22:51 +02:00
Laurent Destailleur
957270783e Comments 2012-07-04 10:21:39 +02:00
Regis Houssin
cc4b2bf69c New: add box activity 2012-07-04 09:07:15 +02:00
Regis Houssin
454aa69697 Fix: missing images files filter 2012-07-03 21:13:09 +02:00
Regis Houssin
1c97934f6d Fix: test if ckeditor is enable 2012-07-03 16:42:04 +02:00
simnandez
a305b7d555 Trad: Add missing translations 2012-07-03 15:43:08 +02:00
Regis Houssin
4a0dad9524 Fix: missing shipping linked object box 2012-07-02 22:41:45 +02:00
Regis Houssin
0bb3aced2f Fix: access problem if thirdparty module is disable 2012-07-02 20:04:28 +02:00
Regis Houssin
9c2f1a7544 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-02 19:31:00 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Laurent Destailleur
24ede26dd7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-07-02 18:37:53 +02:00
Laurent Destailleur
6769cbbd2c Increase size of ref for products 2012-07-02 17:47:16 +02:00
Regis Houssin
897d59d8fa Fix: converting lines delimiter 2012-07-02 17:20:20 +02:00
Regis Houssin
d593878c78 Fix: big problem with linked elements 2012-07-02 17:07:37 +02:00
Regis Houssin
95c30de0b9 Fix: wrong sql request 2012-07-02 16:12:55 +02:00
Regis Houssin
c69fa495fa Fix: compatibility with multicompany 2012-07-02 15:42:35 +02:00
Regis Houssin
761f841735 Fix: missing contract reference 2012-07-02 10:37:39 +02:00
Regis Houssin
96bd81d387 Fix: sql request error 2012-07-02 10:14:01 +02:00
Laurent Destailleur
e300bb0611 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-30 01:48:58 +02:00
Laurent Destailleur
b3f99e946f Merge pull request #234 from defrance69/patch-6 
Update develop
 2012-06-29 03:38:26 -07:00
Regis Houssin
a96ab9a587 Fix: missing parameters ! 2012-06-29 10:08:48 +02:00
Regis Houssin
a26e03367b New: remove linked elements invalid 2012-06-29 09:35:20 +02:00
Laurent Destailleur
efbd0a2533 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-28 22:58:44 +02:00
Laurent Destailleur
a30b366b2b Fix: Can't modifiy accountancy code sell 2012-06-28 20:01:50 +02:00
Laurent Destailleur
4176287094 Fix: Panicum module for supplier accountancy code 2012-06-28 19:51:25 +02:00
Laurent Destailleur
732a98d9bb New: Show company in contact box 2012-06-28 09:43:30 +02:00
Laurent Destailleur
3242f2fb6c Fix: Removed warnings 2012-06-27 23:54:31 +02:00
Laurent Destailleur
8d3a03ab18 Qual: Normalize code 2012-06-27 23:46:25 +02:00
Laurent Destailleur
693deca816 Fix: doxygen 2012-06-27 23:45:58 +02:00
Regis Houssin
1755c34208 Fix: add ckeditor create div option with dolibarr_mailings toolbar 2012-06-27 16:36:25 +02:00
Laurent Destailleur
339e944b32 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-27 13:25:53 +02:00
Laurent Destailleur
ef81408dc0 Fix: Missing include 2012-06-27 13:25:13 +02:00
Regis Houssin
2334e5814d Merge pull request #235 from jfefe/develop 
Fix : use lastname to test contact ldap synchro (not name)
 2012-06-27 02:37:24 -07:00
Laurent Destailleur
2ab416889a First change to use native date functions instead of adodb 2012-06-27 10:58:51 +02:00
Laurent Destailleur
aa649c167d Fix: Bad hour 2012-06-27 01:40:25 +02:00
Laurent Destailleur
87efb2cbb0 Add log 2012-06-27 00:41:57 +02:00
Laurent Destailleur
787f423448 Fix: Removed warning. Fix compatibility. 2012-06-26 23:11:46 +02:00
jfefe
e2b4a69c89 Fix : use lastname to test contact ldap synchro (not name) 2012-06-26 13:11:04 +02:00
Laurent Destailleur
3b9d7c0125 New: Add webservice for thirdparty creation and list. 2012-06-25 13:06:26 +02:00
Laurent Destailleur
9669deb737 Turkish translation 2012-06-24 19:59:24 +02:00
Laurent Destailleur
4a98dbe9a5 Fix: Remove warning 2012-06-24 19:43:38 +02:00
Laurent Destailleur
018cafe92c Fix: Add an unsecape function to decode javascript escape 
encoding. This also fix ecm for cyrillic chars.
 2012-06-24 19:32:19 +02:00
Laurent Destailleur
0a75367a74 New: Auto ecm for third parties 2012-06-24 17:49:52 +02:00
Laurent Destailleur
db4008850b Fix: missing include 2012-06-23 22:25:40 +02:00
Laurent Destailleur
9a36956619 New: Can filter list of proposal, order or invoice on sales 
representative
 2012-06-23 20:48:50 +02:00
Laurent Destailleur
f2de43b771 New: Can filter list of proposal, order or invoice on sales 
representative
 2012-06-23 20:39:20 +02:00
Laurent Destailleur
9e4af7c5a7 Fix: group by not complete 2012-06-23 20:29:35 +02:00
Laurent Destailleur
6e29a098c0 Fix: fckeditor ko on linux distrib 2012-06-23 20:17:51 +02:00
Laurent Destailleur
a34ce201b1 Normalize themes 2012-06-23 15:44:02 +02:00
Laurent Destailleur
6c6e542fc0 Fix: Bad style 2012-06-23 15:17:04 +02:00
Laurent Destailleur
4792727ca6 Fix: Label was not translated 2012-06-23 15:01:08 +02:00
BENKE Charles
63493a6d1f Update develop 2012-06-21 12:30:22 +03:00
Laurent Destailleur
90569e264c Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/master.inc.php
 2012-06-20 23:34:08 +02:00
Laurent Destailleur
f52cb1b571 Fix: We must not define language var if parm not defined. 2012-06-20 23:31:02 +02:00
Regis Houssin
c041feec6a Fix: missing not empty test 2012-06-20 22:23:43 +02:00
Laurent Destailleur
cb0cd9c7fe Fix: If option to not manage a login is on, login is not output into 
info message.
Fix: Bad error management
 2012-06-19 21:54:36 +02:00
Laurent Destailleur
c273f9f698 Fix: escape double quotes into dol_html_escapetag 
New: Passwords not reset into install page.
 2012-06-17 23:27:17 +02:00
Regis Houssin
2e22ac895f Fix: change smtps for have the same email structure of phpmail 2012-06-17 18:43:30 +02:00
Laurent Destailleur
492cf03989 Fix: Removed warning 2012-06-17 17:44:38 +02:00
Regis Houssin
4e1418a6a6 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-16 08:22:08 +02:00
Laurent Destailleur
90bfea882a Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-16 00:08:03 +02:00
Laurent Destailleur
7e46ddd5b0 Fix: Permissions for click2dial tab 2012-06-16 00:07:24 +02:00
Regis Houssin
4db07c3d34 Fix: avoid empty email address 2012-06-15 16:54:13 +02:00
Regis Houssin
cf7872497e New: add EXTERNAL_USERS_ARE_AUTHORIZED for bypass security access for 
external users
 2012-06-15 16:53:44 +02:00
simnandez
cedde3ef83 Fix: [ bug #427 ] Bad links to wiki help in certains menus 2012-06-15 16:13:18 +02:00
simnandez
cf85f6708e Fix: [ bug #427 ] Bad links to wiki help in certains menus 2012-06-15 15:43:00 +02:00
Laurent Destailleur
18c5588c5e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-06-15 11:24:28 +02:00
Laurent Destailleur
4f1d6d7328 Fix: missing a return into clean_url function 2012-06-15 11:24:09 +02:00
Regis Houssin
c6d703de54 Fix: convert lines delimiters 2012-06-15 11:20:09 +02:00
Regis Houssin
a7e45ae10d Fix: missing urlfrom 2012-06-15 11:18:44 +02:00
Laurent Destailleur
44f31bf21c Fix: The fix made by renaming PDF_ADDALSOTARGETDETAILS into MAIN_PDF_ADDALSOSOURCEDETAILS was fixing things in the wrong direction. The regression was the missing data on the recipient compared to 3.1.1 2012-06-15 11:16:17 +02:00
Laurent Destailleur
81eadcd426 Fix: Avoid warning if param is empty 2012-06-15 10:05:28 +02:00
Laurent Destailleur
c592bc88b8 Fix: Init 2012-06-15 02:17:00 +02:00
Laurent Destailleur
6f8ad124a1 New: Can correct stock of a warehouse from warehouse card. 2012-06-15 02:16:35 +02:00
Laurent Destailleur
bfee1630a0 Typo 2012-06-15 01:09:25 +02:00
Laurent Destailleur
db910c8c6f Update logo 2012-06-15 00:59:58 +02:00
Laurent Destailleur
d8ee62101a Fix: function dol_nboflines_bis 2012-06-15 00:15:30 +02:00
Laurent Destailleur
1ddbc12258 Fix: No link if not found into table 2012-06-14 22:56:14 +02:00
Laurent Destailleur
a7d27fc711 Fix: Update was broken 2012-06-14 22:47:45 +02:00
Laurent Destailleur
8d01ba75c9 Fix: Provide a solution for backup when mysqldump is not available 2012-06-14 22:33:27 +02:00
Regis Houssin
1155b0097b New: add advanced rights 2012-06-14 20:11:54 +02:00
Regis Houssin
4f67488bd3 New: add possibility to hide unauthorized buttons 2012-06-14 20:11:43 +02:00
Laurent Destailleur
ec621d2dcb Fix: Bad calculation of nb of line. Fix: Bad position of lines into pdf_soleil 2012-06-14 19:58:35 +02:00
Laurent Destailleur
3fe6ed9a7d Fix: Messy source address 2012-06-14 17:50:32 +02:00
Laurent Destailleur
c1c94abcd3 Fix: Menu list was empty into menu editor. 2012-06-14 16:48:02 +02:00
Laurent Destailleur
66740071fd Fix: Use order date for stats, not valid date. 2012-06-14 14:30:58 +02:00
Laurent Destailleur
a1bd60a614 Fix: No call of any login method. 2012-06-14 14:08:29 +02:00
Regis Houssin
515d8278bc Fix: wrong method 2012-06-14 09:44:27 +02:00
Regis Houssin
159206d52c Fix: $id and $rowid conflict 2012-06-14 09:27:16 +02:00
Regis Houssin
7644fa96dc Fix: uniformize code and add specific rights 2012-06-13 21:48:59 +02:00
Regis Houssin
0d6004588e Fix: adjust user rights and change status icon 2012-06-13 21:48:38 +02:00
Laurent Destailleur
6cd03f9ccd Fix: typo error 2012-06-13 20:13:57 +02:00
Laurent Destailleur
864589f4cf Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-13 11:33:37 +02:00
Laurent Destailleur
daad1877a8 New: Add link to third party into sells and purchase journal. 2012-06-13 11:32:09 +02:00
Regis Houssin
6246228544 New: add extraparams, hooks and extrafields for emailing card 2012-06-13 09:28:59 +02:00
Regis Houssin
315fba37fc Fix: restore broken feature (hooks) 2012-06-13 09:28:48 +02:00
Regis Houssin
df28f09286 Fix: mutualize ckeditor parameters 2012-06-12 23:13:25 +02:00
Laurent Destailleur
a23df4f407 Qual: Removed deprecated var 
New: Can add global js
 2012-06-12 18:35:29 +02:00
Regis Houssin
302c0bb778 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-11 22:39:26 +02:00
Regis Houssin
06ef4ea4c4 Fix: missing end parenthesis 2012-06-11 22:38:52 +02:00
Regis Houssin
38b0b5b39d Merge pull request #226 from defrance69/patch-5 
if day of week < 7 display 2 times the day : 3 days 3 days
 2012-06-11 13:05:26 -07:00
Regis Houssin
5009867181 Merge pull request #225 from simnandez/develop 
Fix: Bad link to propal list into stadistics and dashboard boxes
 2012-06-11 13:02:56 -07:00
Regis Houssin
774be84c54 Merge pull request #220 from GPCsolutions/supplier-orders-box 
New box showing the latest supplier orders.
 2012-06-11 13:02:01 -07:00
Regis Houssin
fee5a0894c Merge pull request #221 from GPCsolutions/pgsql 
Fix first activation of some modules on PgSQL
 2012-06-11 13:00:37 -07:00
Regis Houssin
bf379fc242 Fix: uniformize code 2012-06-11 21:45:59 +02:00
Laurent Destailleur
0739942b7e Can add more text into title shown by getNomUrl 2012-06-11 19:28:04 +02:00
Regis Houssin
e0109c019d Fix: update jquery-cookie plugin 2012-06-11 17:26:48 +02:00
Laurent Destailleur
8c5f0f6811 New: Update mailman mailing-list subscription. 2012-06-11 01:34:51 +02:00
Laurent Destailleur
a1cd073640 Fix: Translation key 2012-06-10 22:02:14 +02:00
Laurent Destailleur
9a3e3e8e18 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-10 21:55:46 +02:00
Laurent Destailleur
98676ddaa1 Qual: Enhance mailmanspip module. 
New: When a member is validated, we can subscribe to mailing-lists
according to its type.
 2012-06-10 21:49:19 +02:00
Regis Houssin
cc18dab5c9 Fix: missing remove_file action 
Fix: use object instead id and store odt filename in object for use in
triggers
 2012-06-10 17:09:10 +02:00
Laurent Destailleur
b7abad95d8 Doxygen 2012-06-10 13:22:28 +02:00
Laurent Destailleur
ae10eb0360 Doxygen 2012-06-10 13:19:20 +02:00
Laurent Destailleur
7147994fd6 Fix: Checkstyle 2012-06-10 13:17:53 +02:00
Laurent Destailleur
c774d94bc9 Fix: Checkstyle 2012-06-10 13:15:24 +02:00
Laurent Destailleur
37f7c98e50 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-10 13:08:56 +02:00
defrance69
2540f727c0 if day of week < 7 display 2 times the day : 3 days 3 days 
add the 's' if they are many days
 2012-06-10 13:42:19 +03:00
simnandez
530743e8b4 Fix: Bad link to propal list into stadistics and dashboard boxes 2012-06-10 11:10:18 +02:00
Regis Houssin
af38a2fab7 Fix: bad parameters, use global 2012-06-10 10:29:43 +02:00
Laurent Destailleur
ddf274e2c1 Fix: translation 2012-06-09 19:44:35 +02:00
Laurent Destailleur
50719271c0 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-09 19:33:52 +02:00
Laurent Destailleur
e6cd400bc3 Qual: List of elements must be into a page called "list.php". 2012-06-09 19:16:31 +02:00
Regis Houssin
b51cd362b0 Fix: problem with external modules and uniformize code 2012-06-09 18:40:36 +02:00
Laurent Destailleur
85e7e5eddd Fxi: Removed checkstyles errors 2012-06-09 13:54:05 +02:00
Laurent Destailleur
fd0450457d New: Can insert links into elements lines. Also reported into PDF. 2012-06-09 13:16:55 +02:00
Laurent Destailleur
931b1d3ab7 Fix: Removed non greek sentences 2012-06-09 12:37:40 +02:00
Laurent Destailleur
1a3a045af6 Fix: No alpha here, this breaks ability to submit html content with 
images or links.
 2012-06-09 12:33:51 +02:00
Laurent Destailleur
655c317645 Fix: Turkish translation 2012-06-09 00:22:41 +02:00
Laurent Destailleur
394e044fa8 Fix: Missing translation key 2012-06-09 00:18:47 +02:00
Laurent Destailleur
158930eb7b Fix: function is loaded once and not overwritten if loaded 
by another ajax page. So if we need inputok/ko and pageyes/no to be
different according to ajax calls (to have several confirm box
loaded from different ajax parts of page, we must place such variables
outside of function. For this $useglobalvars must be set to 1.
 2012-06-08 23:48:53 +02:00
Laurent Destailleur
1022c73c24 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-08 22:17:14 +02:00
Regis Houssin
f4135d3758 Fix: delete or rename a document product dir 2012-06-08 21:40:27 +02:00
Regis Houssin
355cb988b7 Fix: missing oldcopy during update 2012-06-08 21:40:15 +02:00
Laurent Destailleur
62766288c8 Fix: Another fix for var not initialized 2012-06-08 21:39:44 +02:00
Laurent Destailleur
59e39b5d91 Fix: A lot of pb into javascript. Javascripts code for same feature was 
not inserted always at same place (sometinmes at low level, and
sometimes at high level). This was creating conflict into javascript.
 2012-06-08 21:33:12 +02:00
Laurent Destailleur
85f31fc0cb Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-08 20:37:14 +02:00
Regis Houssin
513e3b8ae7 Fix: remove deprecated code can cause warning 2012-06-08 18:18:59 +02:00
Regis Houssin
e6c6d6cf84 Fix: avoid warning 2012-06-08 18:17:03 +02:00
Regis Houssin
bd6f5c4ca7 Fix: use template for best visibility 2012-06-08 18:03:00 +02:00
Regis Houssin
d9e3a941de Fix: conflict with anothers dialog box 2012-06-08 17:06:22 +02:00
Regis Houssin
1fc102825a Fix: bad option name 2012-06-08 11:47:34 +02:00
Regis Houssin
92b02a0084 Fix: add iframe transport for compatibility with all browser 2012-06-08 11:35:32 +02:00
Laurent Destailleur
8a4a74a1bf Look: Add more space 2012-06-07 20:58:26 +02:00
Laurent Destailleur
5c553878c7 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-06 23:13:06 +02:00
Laurent Destailleur
b120eb9a15 Fix: Confirm box not opened 2012-06-06 23:12:33 +02:00
Laurent Destailleur
f575dd4ae5 Fix: bad error management 2012-06-06 23:06:17 +02:00
Regis Houssin
d0161087cb Fix: problem with external module 2012-06-06 23:02:02 +02:00
simnandez
b96fb07cbf [ task #104 ] Possibilité de facturer plusieurs commandes 2012-06-06 18:02:47 +02:00
Raphaël Doursenaud
a29301d8b5 Indent 2012-06-06 16:35:58 +02:00
Raphaël Doursenaud
2a8cc5ad60 Fix a bug preventing module enablement with PostgreSQL 2012-06-06 16:30:52 +02:00
Regis Houssin
4d2a77a657 Fix: missing search in alternative root directory 2012-06-06 14:04:19 +02:00
Laurent Destailleur
23dea40504 Fxi: Bad permission check 2012-06-05 23:32:13 +02:00
Laurent Destailleur
9a7382de1b Fix: Exclude temp file 2012-06-05 23:31:46 +02:00
Laurent Destailleur
5ab3512914 Fix: Missing permission check 2012-06-05 23:12:40 +02:00
Laurent Destailleur
eb3484d6b6 No need of compatibility mode 2012-06-05 12:52:25 +02:00
Laurent Destailleur
07a6ee67e2 Minor perf enhancement 2012-06-05 12:42:32 +02:00
Laurent Destailleur
14719d1b7a Compatibility mode 2012-06-05 12:34:34 +02:00
Laurent Destailleur
dadc36ad18 Fix for PHP < 5.3 2012-06-05 12:27:42 +02:00
Laurent Destailleur
50f3e480c9 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-05 12:11:45 +02:00
Laurent Destailleur
b6fb117f78 Fix if tz is UTC. 2012-06-05 12:11:20 +02:00
Raphaël Doursenaud
29bfc2f310 Fixed supplier url in supplier orders' box 2012-06-04 18:05:19 +02:00
Raphaël Doursenaud
0f410996f7 New box showing the latest supplier orders. 2012-06-04 17:37:38 +02:00
Laurent Destailleur
044ca3062b Fix: Use wrong handler. Make install fails. 2012-06-04 02:13:59 +02:00
Regis Houssin
ed50c65631 Fix: date format error 2012-06-03 23:53:58 +02:00
Regis Houssin
93e3c3e3f3 Fix: merge array of hookmanager errors 2012-06-03 23:53:32 +02:00
Laurent Destailleur
dfb697d794 Prepare ajax for ecm module. 2012-06-02 18:55:04 +02:00
Laurent Destailleur
88c5d0f6e9 USe html & not xml 2012-06-02 14:56:36 +02:00
Laurent Destailleur
3d73952376 Look: Reduce login table pad 2012-06-02 14:07:38 +02:00
Laurent Destailleur
df45c51336 Fix: Solve error Method Not Implemented 2012-06-01 21:15:14 +02:00
Laurent Destailleur
7bc803ca9e Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-01 20:51:55 +02:00
Laurent Destailleur
6147377e16 Fix: Try a fix for the _FILES escape problem. 2012-06-01 20:51:31 +02:00
Raphaël Doursenaud
38740fb70f Fixed a bug in interventions' list navigation 
The navigation arrows were referencing "index.php" file thus
preventing navigation between pages.
The actual name of the file is "list.php".
 2012-06-01 11:21:56 +02:00
Laurent Destailleur
61ed269044 Fix: restore broken feature. File upload/delete was ko with linux and 
windows.
Note also that strisplashes should never be used anywhere in the code,
because strislashes is nor a HTML escape, nor a javascrip escape, nor a
shell or PHP escape function. If stripslashes is used somewhere, this
means there is a bug somewhere else.

upload/delete using the standard feature (not fileupload) works
correctly with that on linux/windows.
 2012-06-01 10:16:42 +02:00
Laurent Destailleur
f11508a09e Fix: an url must be with url escape format. 2012-06-01 10:12:28 +02:00
Regis Houssin
84cf35d8f2 Fix: Multi-line function call not indented correctly 2012-06-01 08:05:45 +02:00
Regis Houssin
6c8db0aa2d Fix: Protected member variable must not be prefixed with an underscore 2012-06-01 07:59:45 +02:00
Regis Houssin
e9994c683a Fix: clear file name send by php 2012-06-01 07:11:00 +02:00
Raphaël Doursenaud
6c963fc591 Fixed a bug preventing invoice sorting by authors 2012-06-01 03:07:05 +02:00
Laurent Destailleur
9985355f9e Merge pull request #215 from simnandez/develop 
Trad: Add translation
 2012-05-31 18:04:32 -07:00
Laurent Destailleur
8f5a95255d Checkstyle 2012-06-01 02:32:17 +02:00
Laurent Destailleur
93ced076ac Checkstyle 2012-05-31 21:25:22 +02:00
Regis Houssin
2ad1cf0665 Fix: more clean code for new version of jQuery fileupload 2012-05-31 21:11:36 +02:00
Regis Houssin
274734b828 Fix: stock message in session and reload the page for avoid url problem 
with jQuery fileupload
 2012-05-31 21:11:26 +02:00
Regis Houssin
248f0e9d08 Fix: reload page after file upload completed 2012-05-30 23:14:35 +02:00
Regis Houssin
6c5237f94e Fix: add max file size 2012-05-30 22:44:44 +02:00
Regis Houssin
1e77ff069a Fix: replace Bootstrap version by jQueryUI version 2012-05-30 22:13:23 +02:00
Laurent Destailleur
1929c1784d Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-30 21:41:52 +02:00
Laurent Destailleur
d9efb88d35 Fix: Can edit emailing even when validated. 2012-05-30 21:40:32 +02:00
Simnandez
5a1001f006 Trad: Add translation 2012-05-30 18:00:37 +02:00
juanjo
c24b901dd6 [ task #104 ] Possibilité de facturer plusieurs commandes. Init works 2012-05-30 14:48:23 +02:00
Regis Houssin
85e3407559 Fix: Unescape a file submitted by upload. PHP escape char " (%22) and 
char ' (%27) into $FILES
Before= Capture d\'écran.doc  After= Capture d'écran.doc
 2012-05-30 13:58:20 +02:00
Laurent Destailleur
17b50e02b7 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-30 12:43:50 +02:00
Laurent Destailleur
c2db3265ec Fix: Regression with quot management. Try a better fix. 2012-05-30 12:43:23 +02:00
Laurent Destailleur
705c152f7a Fix: js not escaped 2012-05-30 12:33:31 +02:00
Regis Houssin
1ea7e53273 Works on jQuery fileupload upgrade (Todo: css problem) 2012-05-30 11:57:00 +02:00
Laurent Destailleur
6d245e6f31 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-30 11:22:20 +02:00
Laurent Destailleur
fb4d62c34a Fix: Some fix into the canvas for companies. 2012-05-30 11:21:42 +02:00
Regis Houssin
a5b0de15ac Fix: can't delete a files with quote 2012-05-30 08:30:25 +02:00
Regis Houssin
a486da1b0e Fix: restore files for template engine 2012-05-30 07:43:06 +02:00
Laurent Destailleur
ebf77e8c92 A better fix to remove files from document list 2012-05-30 04:11:00 +02:00
Laurent Destailleur
3c98daaf09 More fix for canvas features 2012-05-30 03:46:06 +02:00