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

29654 Commits

Author SHA1 Message Date
Maxime Kohlhaas
2f743cd7f8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-11-28 15:32:27 +01:00
Laurent Destailleur
b1c13e373a Fix: A better fix to remove fk_pays. 2012-11-28 15:31:55 +01:00
Maxime Kohlhaas
5e5cb1da92 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-11-28 14:53:48 +01:00
Laurent Destailleur
9139427d7f Fix: Country default not selected 2012-11-28 14:51:39 +01:00
Laurent Destailleur
caab5ac4e0 New: Add option to be able to select onto automatic event and manual 
event (or both) into calendar view. Note: For backward compatibility
reason, this will works only for new events.
Qual: Disable old deprecated event code.
 2012-11-28 14:47:30 +01:00
Christophe Battarel
f0918a2536 remove unused arrays into pdf models (localtaxes) 2012-11-28 12:13:03 +01:00
Christophe Battarel
1e8aae4de4 show local taxes on crabe pdf model 2012-11-28 12:11:42 +01:00
Laurent Destailleur
cbdcb50ce2 Merge pull request #499 from cbattarel/develop 
show local taxes on invoice
 2012-11-28 03:11:07 -08:00
Christophe Battarel
12284bf676 show local taxes on invoice 2012-11-28 12:04:31 +01:00
Laurent Destailleur
8fdf4aaf3b Merge pull request #498 from FHenry/develop 
Add cancel button (go bask -1 history)
 2012-11-28 02:37:00 -08:00
Laurent Destailleur
2b51132b32 Translation of localtax admin. 2012-11-28 11:34:52 +01:00
Laurent Destailleur
b34ce6e2f0 Merge pull request #495 from cbattarel/develop 
[ task #204 ] Manage canadian, spain and other country double VAT with a generic system. various updates for local taxes
 2012-11-28 02:08:07 -08:00
Maxime Kohlhaas
925e59e246 Fix : default country on contact creation was not set properly 2012-11-28 11:04:54 +01:00
fhenry
fca43941b0 Add cancel button (go bask -1 history) 2012-11-28 10:57:55 +01:00
Maxime Kohlhaas
32f5b4efa6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-11-28 10:57:51 +01:00
Christophe Battarel
b9cdde88c7 show localtaxes on einstein pdf model 2012-11-28 10:43:21 +01:00
Christophe Battarel
e8e4cc08de show localtaxes in order 2012-11-28 10:35:16 +01:00
Christophe Battarel
0e144dd7c3 fix wrong test for localtax assuj check 2012-11-28 10:32:24 +01:00
Christophe Battarel
f00b4b5527 correction to allow global local tax (type 7) on localtax1 2012-11-28 10:24:40 +01:00
Christophe Battarel
cee8e16e7e correct wrong check for localtaxes 2012-11-28 09:32:41 +01:00
Laurent Destailleur
65110ead88 Merge pull request #496 from FHenry/develop 
Update Common Object update_contact method to allow to change the
 2012-11-27 11:32:53 -08:00
Laurent Destailleur
7ee2ce3c21 Merge pull request #492 from atm-maxime/mko527 
New : go directly into supplier invoice number field after cloning
 2012-11-27 11:08:14 -08:00
Laurent Destailleur
da9ac187dd Merge pull request #493 from atm-maxime/mko545 
Qual : clean unused code
 2012-11-27 11:08:01 -08:00
Laurent Destailleur
53d997f59b Merge pull request #494 from atm-maxime/mko608 
Task # 608 : add clone function on supplier order
 2012-11-27 11:07:03 -08:00
fhenry
5c94912e66 Add datehourpicker in editfieldval method to allow display of hour 2012-11-27 18:35:51 +01:00
simnandez
0bed303596 Trad: Added english (arabi saudia) into ca_ES and es_ES 2012-11-27 17:54:42 +01:00
simnandez
8dc0aec754 [ task #204 ] Manage canadian, spain and other country double VAT with a 
generic system. Add spanish tests
 2012-11-27 16:52:52 +01:00
Christophe Battarel
203a03c4d1 show local taxes on pdf propale azur model 2012-11-27 15:56:45 +01:00
Christophe Battarel
46089bb03c also update ttc with global local taxes 2012-11-27 15:43:52 +01:00
Christophe Battarel
3b8f002e4f display of total local taxes 2012-11-27 15:37:16 +01:00
Christophe Battarel
e87bb02323 retrieve global local taxes in update_price function 2012-11-27 15:34:46 +01:00
Christophe Battarel
9f03b56348 dont put global local tax on lines 2012-11-27 15:33:11 +01:00
fhenry
f456a4d0fe Update Common Object update_contact method to allow to change the 
fk_socppoeple linked
 2012-11-27 15:26:14 +01:00
Laurent Destailleur
a495bcefaa Fix: language translation for araby saudia 2012-11-27 14:13:42 +01:00
Laurent Destailleur
49730ac24f Code comments only 2012-11-27 13:58:06 +01:00
Christophe Battarel
e919ce893a check if company has localtaxes for its country 2012-11-27 13:05:21 +01:00
Laurent Destailleur
6c9d6eda56 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-27 09:34:34 +01:00
Laurent Destailleur
959e061373 Added english (arabi saudia) 2012-11-27 09:34:14 +01:00
Laurent Destailleur
3f64b533f4 Fix: [ bug #607 ] Nom de société avec guillemets 2012-11-26 16:06:50 +01:00
Laurent Destailleur
4abae05c26 Qual: Uniformize behaviour of product selection 2012-11-26 13:37:40 +01:00
Laurent Destailleur
c9edac9cd6 Try to fix differently pb of change/keyup because current change has a 
regression (no way to use ajax select onto supplier orders when using
keybord or mouse selection).
 2012-11-26 13:33:18 +01:00
Laurent Destailleur
d9fb0c941b Qual: remove select to have id same with combo and ajax 2012-11-26 13:28:02 +01:00
Laurent Destailleur
641f4b1ecc Qual: Change to unformize returns of hooks. 2012-11-26 13:26:50 +01:00
Laurent Destailleur
4480af348c Fix: Cols at wrong place 2012-11-26 11:57:20 +01:00
Laurent Destailleur
b4ebd7e852 Qual: Uniformize code and fix a regression 2012-11-26 11:36:45 +01:00
Laurent Destailleur
6c8b00b82f Fix: Removed duplictae key 2012-11-25 21:00:51 +01:00
Laurent Destailleur
3de396afa6 Fix: Class not found 2012-11-25 20:42:53 +01:00
Laurent Destailleur
b977ea5d87 Fix: Regression. Show bad error message when we add a product with no 
prices defined.
 2012-11-25 20:38:39 +01:00
Maxime Kohlhaas
437d082308 Fix : multicompany comptability 2012-11-24 00:06:54 +01:00
Maxime Kohlhaas
3306d91ce1 Task # 608 : forgot to clone lines... Now lines are also cloned and prices are valid prices at the clone date 2012-11-23 09:00:17 +01:00
Maxime Kohlhaas
0bb3f766f6 New : Add clone function on supplier order + global object fetch instead of each case 2012-11-22 23:38:35 +01:00
Maxime Kohlhaas
5c9058e688 Qual : clean unused code 2012-11-22 21:56:06 +01:00
Maxime Kohlhaas
ba3ae073d7 New : go directly into supplier invoice number field after cloning 2012-11-22 19:59:31 +01:00
Maxime Kohlhaas
0d6aee24f3 Fix : table displayed not like others 2012-11-22 16:35:51 +01:00
Maxime Kohlhaas
9e4cba13c8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-11-22 15:24:10 +01:00
Laurent Destailleur
e76ef823b8 New: Add a tab into members statistics to count members by nature. 2012-11-21 23:01:36 +01:00
Laurent Destailleur
59a305f6f1 New: no dash line if last item. 2012-11-21 20:35:51 +01:00
Laurent Destailleur
35a887f869 Clean code 2012-11-21 20:24:15 +01:00
Laurent Destailleur
1f263943c5 New: Add option to add slashes lines between lines into PDF. 2012-11-21 19:07:03 +01:00
Laurent Destailleur
e6d7ce1ab6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-21 19:04:51 +01:00
Laurent Destailleur
c49fea217f Fix: Another fix on sql request generation. 2012-11-21 19:00:06 +01:00
Regis Houssin
ce4feffd1f Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-11-21 18:56:07 +01:00
Regis Houssin
31ecc1987e Fix: remove old code 2012-11-21 18:52:25 +01:00
Laurent Destailleur
06a8ba2be2 Fix: for combo list that use text key. 2012-11-21 18:51:49 +01:00
Laurent Destailleur
6a11016a21 Fix: var_dump must be commented 2012-11-21 18:45:52 +01:00
Laurent Destailleur
66cf1419ca Fix: llx_c_paper_format dictionnary was not up to date. 2012-11-21 17:48:27 +01:00
Laurent Destailleur
c0c13b862a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-21 14:45:33 +01:00
Laurent Destailleur
af637c8afb Qual: Removed "dolibarr" into default email sender. 2012-11-21 14:45:02 +01:00
Laurent Destailleur
6db5185d7e Fix: Missing include 2012-11-20 23:57:35 +01:00
Laurent Destailleur
733214733e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-11-20 17:46:44 +01:00
Laurent Destailleur
6c4e1caa04 Merge pull request #491 from simnandez/develop 
Trad: Add ca_ES and es_ES translations
 2012-11-20 08:34:45 -08:00
Laurent Destailleur
28e95231c0 Merge pull request #483 from atm-maxime/develop 
Warning on proposal home pages
 2012-11-20 08:34:15 -08:00
Laurent Destailleur
8f0b548714 Debug export filters. Seems to be enougth stable so it is now enabled by 
default.
 2012-11-20 15:56:44 +01:00
Laurent Destailleur
d9cdb542d5 Debug filter during export 2012-11-20 14:07:52 +01:00
Laurent Destailleur
2e0554bfbd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-11-20 13:36:03 +01:00
Laurent Destailleur
ddb3cf6f42 Fix: Debug holiday module 2012-11-20 13:14:16 +01:00
Regis Houssin
babda1d7df Fix: increase field size for GB sort code (xx-xx-xx) 2012-11-20 12:43:00 +01:00
Laurent Destailleur
005716af99 Fix: Missing includes 2012-11-20 12:40:57 +01:00
Laurent Destailleur
a62583e987 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-11-20 12:33:24 +01:00
Laurent Destailleur
2d000b5df8 Fix: The default select choice was not selected when using jquery dialog 
confirm boxes.
 2012-11-20 12:23:32 +01:00
Regis Houssin
2d5368e135 Fix: converting line delimiters 2012-11-20 12:11:19 +01:00
Regis Houssin
a3d9b5788c Fix: use keyup instead change to avoid loosing the product id 
Fix: strict mode
 2012-11-20 12:09:52 +01:00
Laurent Destailleur
6a97a45111 Qual: Rename translation key 2012-11-20 11:27:50 +01:00
Laurent Destailleur
e53f6a383d Fix: Removed a hard coded error code. 2012-11-20 11:23:34 +01:00
Laurent Destailleur
8d50def412 Sec: Do not init password by default when install pages are recalled 2012-11-20 11:22:57 +01:00
simnandez
b593fa2df6 Trad: Add ca_ES and es_ES translations 2012-11-20 09:04:24 +01:00
Laurent Destailleur
6cdb720e9c Fix: Missing info_admin 2012-11-20 00:13:31 +01:00
Laurent Destailleur
72608e7a72 Fix: Checkstyle 2012-11-19 23:43:14 +01:00
Laurent Destailleur
d8d1db143f Typo 2012-11-19 23:26:07 +01:00
Laurent Destailleur
bd90d7979d Qual: Removed duplicate code 
Qual: Removed deprecated warning
 2012-11-19 17:42:37 +01:00
Laurent Destailleur
0fb126a7e3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-11-19 17:30:57 +01:00
Laurent Destailleur
3b861598a7 Doc 2012-11-19 17:29:57 +01:00
simnandez
3fe79b379d Fix: Bad calculation of localtax amount calculation if type of 
localtaxes are 1 3 or 5. Researched by Eldy
 2012-11-19 17:10:28 +01:00
Maxime Kohlhaas
ec37a5e005 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-11-19 13:31:23 +01:00
Maxime Kohlhaas
eec5ddc08d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-11-19 13:31:15 +01:00
Regis Houssin
1a4c582b05 Merge pull request #489 from jfefe/webservices 
New webservice for order with method to get, create and valid an order
 2012-11-19 03:16:51 -08:00
jfefe
7157869371 New webservice for order with method to get, create and valid an order 2012-11-19 12:14:51 +01:00
Regis Houssin
f933e03285 Merge pull request #488 from jfefe/webservices 
Add information about price when call a product by webservice
 2012-11-19 01:33:50 -08:00
jfefe
d9d01c80b0 Add information about price when call a product by webservice 2012-11-19 00:35:01 +01:00
Laurent Destailleur
95afbdbd5e Merge pull request #485 from grandoc/develop 
fix some text
 2012-11-18 09:55:39 -08:00
Laurent Destailleur
b9868bf0ce Fix: units 2012-11-18 18:44:51 +01:00
Laurent Destailleur
c2d4b4d2e9 Fix: Edit of emailing setup was not possible 2012-11-18 18:36:50 +01:00
Grand Philippe
1b74df932b fix some translations 2012-11-18 17:39:49 +01:00
Grand Philippe
86ed4ba08c fix some translations 2012-11-18 17:29:31 +01:00
Laurent Destailleur
f58d0636a1 Doxygen 2012-11-18 16:55:00 +01:00
Laurent Destailleur
eb7dc8934c Fix: Do not loose label 2012-11-18 16:41:10 +01:00
Laurent Destailleur
46976bd009 Fix: Some fix in volume calculation 2012-11-18 16:21:38 +01:00
Laurent Destailleur
7386dc3aef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-18 15:24:15 +01:00
Laurent Destailleur
6512fd90a9 New: Can export customer shipments. 2012-11-18 15:24:01 +01:00
Laurent Destailleur
e490aeef43 Merge pull request #487 from jfefe/webservices 
Webservices
 2012-11-18 06:15:21 -08:00
jfefe
324b11ebb9 Add comment 2012-11-18 13:20:27 +01:00
jfefe
f47ce7b220 New webservice to fetch categories 2012-11-18 13:15:19 +01:00
Laurent Destailleur
e0de91144a Merge pull request #484 from simnandez/develop 
Fix: Local taxes. If buyer not subject to localtax no need make database
 2012-11-18 03:11:37 -08:00
Laurent Destailleur
f1f080b86a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-18 11:52:19 +01:00
Laurent Destailleur
3fa7afae10 Fix: jquery upgrade has broken background compatibility with plugins. 
Upgrade jquery core only if required.
 2012-11-18 11:52:04 +01:00
Regis Houssin
dc775c4418 Merge pull request #486 from jfefe/webservices 
Webservices
 2012-11-17 23:35:33 -08:00
jfefe
0f789f6ad3 New webservice method to get list of product for a specific category 2012-11-17 23:40:58 +01:00
jfefe
40a3704739 New webservice method to get list of usergroups 2012-11-17 23:21:12 +01:00
Laurent Destailleur
fe86b5d29e Fix: 2 other fixes on option MAIN_JS_ON_PAYMENT 2012-11-17 20:25:44 +01:00
Laurent Destailleur
5b02ff3a86 Fix: 3 fixes on option MAIN_JS_ON_PAYMENT (css, bad path, removed 
forced var)
 2012-11-17 19:55:19 +01:00
Grand Philippe
e5ae46bd11 fix some text 2012-11-17 15:53:04 +01:00
Laurent Destailleur
8c27a3202b Qual: Removed useless files. Speed gain was not significant, has problem 
with https and need a lot of work to maintain each time we update an
external lib.
 2012-11-17 11:56:30 +01:00
Laurent Destailleur
19b7cc66d5 Qual: Remove hidden option so is not efficient and not used files. 
Qual: Uniformize code
 2012-11-17 11:48:51 +01:00
Maxime Kohlhaas
fc4c5f333f Fix : fatal error while importing, function name wasn't complete 2012-11-17 10:19:26 +01:00
Maxime Kohlhaas
da4383777d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-11-17 10:12:33 +01:00
Laurent Destailleur
255bd565fb Removed warning 2012-11-17 00:58:43 +01:00
Laurent Destailleur
61ed6e10e1 Uniformize code 2012-11-16 18:59:03 +01:00
simnandez
5515f15187 Fix: Localtaxes rules for spain 2012-11-16 16:23:51 +01:00
Laurent Destailleur
2e8e1f759f New: Add warning when we try to load sql from an not existing dir 2012-11-16 13:25:49 +01:00
simnandez
b7f38def61 Fix: Local taxes. If buyer not subject to localtax no need make database 
access
 2012-11-16 12:13:29 +01:00
Laurent Destailleur
5f9cf28e45 New: Add option to choose if init of form is for a company third party 
or an individual third party.
 2012-11-15 16:26:05 +01:00
Laurent Destailleur
7c78e1c0f6 Doxygen and normalize code. 
New: add more PHPUnit
 2012-11-15 14:52:19 +01:00
Maxime Kohlhaas
9911c64f0b Fix : $now not defined and proposal date used instead of end validity to display warning 2012-11-14 22:32:20 +01:00
Maxime Kohlhaas
d687d37573 Fix : $now defined twice 2012-11-14 22:31:54 +01:00
Laurent Destailleur
28b4a03432 Fix: Correct vat 2012-11-14 20:49:19 +01:00
Laurent Destailleur
511a75b5de Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-14 18:59:07 +01:00
Laurent Destailleur
ce10c87e09 Fix: No message to show result 
Fix: Must not overwrite property of object
 2012-11-14 18:58:55 +01:00
Laurent Destailleur
4c4eeaac2a Fix: Test fails if value is 0 2012-11-14 18:56:47 +01:00
Laurent Destailleur
768e719961 Fix: firstname was missing 2012-11-14 18:32:52 +01:00
simnandez
096699cf18 Trad: Add missing ca_ES and es_ES translations 2012-11-14 15:17:26 +01:00
jfefe
23e47b7156 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into webservices 2012-11-14 12:42:16 +01:00
jfefe
8f15dd4df2 Fix : correct invoice line description when calling by webservice 2012-11-14 12:42:04 +01:00
Regis Houssin
8908f977b8 Fix: converting line delimiters !!! 2012-11-14 11:31:08 +01:00
Regis Houssin
474b68b3e4 Fix: strict mode mother 2012-11-14 11:29:22 +01:00
Maxime Kohlhaas
667c8cffae Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-11-14 11:02:35 +01:00
Laurent Destailleur
5e583b65f2 Doxygen 2012-11-14 01:35:39 +01:00
Laurent Destailleur
df42dda452 Doxygen 2012-11-14 01:20:36 +01:00
Laurent Destailleur
3dd9d20d53 Add alternative picto for rendez-vous. 2012-11-14 00:59:52 +01:00
Laurent Destailleur
06c77576b7 New: Maxi debug on feature to filter lines on export. Removed a lot of 
bugs but I had to change a lot of thing to fix this. There is still
work to now save filters in session.
 2012-11-14 00:27:25 +01:00
Laurent Destailleur
81f9b54618 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-14 00:23:47 +01:00
Laurent Destailleur
1fa9048ca5 Update nl_BE 2012-11-14 00:23:31 +01:00
Regis Houssin
7be2057b00 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-11-13 22:44:33 +01:00
Regis Houssin
8e141fce14 Fix: strict mode father 2012-11-13 22:43:54 +01:00
Laurent Destailleur
3c7ad3d58c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-11-13 17:27:16 +01:00
Laurent Destailleur
22d1847250 Fix: Option MAIN_MAIL_SENDMAIL_FORCE_BA and MAIN_FIX_BUGGED_MTA was not 
complete.
 2012-11-13 17:25:47 +01:00
Regis Houssin
d9efa95e09 Fix: optimize code 2012-11-13 16:20:15 +01:00
Regis Houssin
84b50f45f8 Fix: strict mode again 2012-11-13 14:44:32 +01:00
Regis Houssin
88658eaf50 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-11-13 12:32:38 +01:00
Regis Houssin
a0c478a0a2 Fix: strict mode cleaner 2012-11-13 12:32:05 +01:00
Laurent Destailleur
cc648e7eb2 Fix: typo error 2012-11-13 11:09:49 +01:00
Regis Houssin
4ec1d376bf Fix: strict mode journey 2012-11-13 09:02:21 +01:00
Regis Houssin
5faa7fb075 Fix: for module name with number 2012-11-12 19:09:53 +01:00
Regis Houssin
b95ab2239f Fix: remove unused code 2012-11-12 09:43:12 +01:00
Laurent Destailleur
124366f41a Fix: To be compatible with LDAP synchro, property oldcopy must be set. 
We add a warning if not.
 2012-11-11 23:31:45 +01:00
Laurent Destailleur
ca7baad663 Translation 2012-11-11 19:45:51 +01:00
Laurent Destailleur
e7164cb243 Fix: Some checkstyle errors 2012-11-11 18:18:57 +01:00
Laurent Destailleur
66755fb166 Fix: Avoid confusion between method getXXX into parent class with 
method getXXX into child class. They are not inheritance, so i renamed
method of parent into getXXXForKey.
 2012-11-11 18:11:10 +01:00
Laurent Destailleur
842982f134 Doxygen 2012-11-11 17:50:24 +01:00
Laurent Destailleur
f9dec36d7a Fix: Regression 2012-11-11 15:44:02 +01:00
Regis Houssin
2240dd4ac6 Fix: missing tinyint 2012-11-11 15:12:42 +01:00
Laurent Destailleur
7d5c4a3b38 Fix: Fix upgrade 
New: Update dump file
Qual: Add label for PHPUnit tests
 2012-11-11 14:34:55 +01:00
Laurent Destailleur
d3ebeccff4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-10 16:24:51 +01:00
Laurent Destailleur
f43b26f311 Fix: Bad link 2012-11-10 16:24:20 +01:00
Regis Houssin
f6c56379dc Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-11-10 16:09:06 +01:00
Regis Houssin
54d4661769 Fix: missing action type for hookmanager 2012-11-10 16:08:26 +01:00
Laurent Destailleur
318ec50134 Merge pull request #479 from atm-maxime/develop 
Fix : proposal warning was based on proposal date
 2012-11-10 05:56:08 -08:00
Regis Houssin
2ecb9262e7 Fix: wrong access rights and remove unused code 2012-11-10 08:19:33 +01:00
Regis Houssin
57cce6f517 Fix: missing global 2012-11-09 19:34:05 +01:00
Regis Houssin
cbb6ddbe83 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-11-09 19:24:33 +01:00
Regis Houssin
0e0582c16f Fix: avoid conflicts with external module if triggers used 2012-11-09 19:23:46 +01:00
Maxime Kohlhaas
8824be0260 Fix : proposal warning was based on proposal date instead of proposal end validity on commercial home page 2012-11-09 16:04:30 +01:00
Maxime Kohlhaas
332c077d77 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-11-09 13:46:50 +01:00
Laurent Destailleur
661d37eacf Fix: New vat for switzerland 2012-11-08 12:15:15 +01:00
Regis Houssin
afe339a2e2 Fix: strict mode 2012-11-07 12:00:17 +01:00
Regis Houssin
40725e72a5 Fix: missing spanish localtax values update 2012-11-07 11:49:28 +01:00
Laurent Destailleur
579544aa2f Add example of comment 2012-11-07 02:22:25 +01:00
Maxime Kohlhaas
7035ec42f1 Task # 559 : Modifications to store unitprice as in supplier prices 2012-11-07 00:38:53 +01:00
Laurent Destailleur
831fe6a29e Fix: More fix about the new localtax system 2012-11-06 23:45:16 +01:00
Maxime Kohlhaas
5586897f70 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-11-06 23:07:40 +01:00
Laurent Destailleur
7d01ea7fc3 Fix: Do not break dolibarr usage if log fails 2012-11-06 19:42:03 +01:00
Laurent Destailleur
fff8598282 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-06 19:30:38 +01:00
Laurent Destailleur
f37c559235 Fix: regression 2012-11-06 19:23:23 +01:00
Laurent Destailleur
9c8d653780 Merge pull request #477 from FHenry/develop 
Fix bug on mass mailling unsubsscribe fonctionnality
 2012-11-06 09:52:32 -08:00
Regis Houssin
869c6e1fda Merge pull request #478 from jfefe/webservices 
Minor improvement of webservice for product
 2012-11-06 08:44:03 -08:00
jfefe
8a69a258fd image information in webservice product : fix wrong objet 2012-11-06 16:18:26 +01:00
fhenry
e12999bcfd Correct fix 2012-11-06 15:39:47 +01:00
fhenry
9a3c7a230b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-11-06 15:36:44 +01:00
Laurent Destailleur
348674c438 Merge pull request #476 from simnandez/develop 
Fix: if no results do not charge data
 2012-11-06 06:26:50 -08:00
jfefe
8175a9a7e5 Add image information in webservice product 2012-11-06 15:16:49 +01:00
Regis Houssin
7de5a7fd3f Fix: compatibility with multicompany 2012-11-06 14:56:49 +01:00