Commit Graph

1939 Commits

Author SHA1 Message Date
Laurent Destailleur
f0f347394a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-17 13:15:30 +01:00
Laurent Destailleur
cccc7d1af3 Fix: comments 2013-01-17 13:02:34 +01:00
Laurent Destailleur
f1f7ff315f Fix: CRLF 2013-01-16 15:54:07 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Laurent Destailleur
1e9cb6b1d4 Qual: A translation file must not be loaded into class constructors, but
at output level.
2013-01-15 17:06:53 +01:00
Laurent Destailleur
4cf56eafa5 Qual: Removed useless param 2013-01-15 12:48:46 +01:00
Laurent Destailleur
f57409ddcd Merge remote-tracking branch 'origin/3.3' into develop 2013-01-15 12:06:41 +01:00
Laurent Destailleur
086b223c81 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-01-15 11:50:15 +01:00
Laurent Destailleur
11bb3d0137 Fix: Several fixes into boxes management: boxes was loaded twice, logs
were wrong, global conf missing.
2013-01-15 11:35:10 +01:00
fhenry
52b4d98849 remove parenthesis not usefull 2013-01-15 11:11:24 +01:00
fhenry
f214c06b1e Add option to fecth extrafield even if extranal extrafield module is
enabled. Usefull for web service to fetch optionnal from llx_extrafields
even if record or update is manage by hook with external module
2013-01-15 10:20:19 +01:00
Laurent Destailleur
285bcbecb7 Fix: init of new syslog handler system 2013-01-14 17:12:13 +01:00
fhenry
51098c1227 Add standard extrafield type :
- mail
	- phone
	- price
2013-01-14 16:13:09 +01:00
Laurent Destailleur
49313fff3b Fix: External user should not see boxes of modules not allowed to
external users.
2013-01-14 13:06:08 +01:00
Maxime Kohlhaas
fb1d99d0dd Multi-company compatibility with transverse mode for home boxes 2013-01-14 11:09:10 +01:00
Laurent Destailleur
29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
2013-01-13 19:33:54 +01:00
Laurent Destailleur
0f6506d457 Fix: not object error with option SERVICE_ARE_ECOMMERCE_200238EC 2013-01-13 18:57:55 +01:00
Laurent Destailleur
1bed4aa193 Merge pull request #602 from FHenry/develop
Add boolean (checkbox) standard extrafield feature
2013-01-12 06:53:48 -08:00
Laurent Destailleur
ec8b260bf6 New: Prepare 3.4 branch
New: Add hook for agenda, info and category tabs
2013-01-12 14:34:16 +01:00
fhenry
d39368fd36 Add boolean (checkbox) standard extrafield feature 2013-01-12 14:02:39 +01:00
Christophe Battarel
49703240f7 show costprice instead of buyingprice if setup of margin module is costprice 2013-01-11 15:39:11 +01:00
Christophe Battarel
38e9290729 show costprice instead of buyingprice if setup of margin module is costprice 2013-01-11 15:33:34 +01:00
Laurent Destailleur
37b6bab893 Fix: Missing lang loading 2013-01-10 22:45:55 +01:00
Laurent Destailleur
03b906808e Merge pull request #593 from marcosgdf/eu-vat
Updated EU VAT area links and added Isle of Man
2013-01-10 12:12:25 -08:00
Marcos García
8e7a66a544 Fixed indentation problem 2013-01-10 14:20:03 +01:00
Marcos García
809367d23b Updated EU VAT area links and added Isle of Man
Isle of Man is in included in UK state as shown in http://ec.europa.eu/taxation_customs/common/faq/faq_1179_en.htm#9
2013-01-10 14:17:43 +01:00
Marcos García
593db37423 Function getTotalDiscount of commonobject.class.php should always return a float for precission 2013-01-10 13:53:46 +01:00
Laurent Destailleur
8ac33e98e7 Fix: property object_total_discount was not working when quantity was
not 1.
2013-01-10 12:58:46 +01:00
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Regis Houssin
9a305c9066 New: add date format with second 2013-01-10 06:13:02 +01:00
Laurent Destailleur
9d47b812b9 New: Support module_parts['theme'] 2013-01-08 15:21:56 +01:00
Laurent Destailleur
ec3421d59e New: Add option MAIN_FORCETHEME (differs from MAIN_FORCETHEMEDIR) 2013-01-08 13:45:52 +01:00
Laurent Destailleur
9b3874f6f9 Fix: PHPUnit found regression 2013-01-08 12:26:02 +01:00
Laurent Destailleur
142f171e50 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/.gitignore
2013-01-08 11:10:47 +01:00
Laurent Destailleur
f96c1d83cb Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-07 23:22:20 +01:00
Laurent Destailleur
0889bdc3eb Fix: Error using static method 2013-01-07 23:20:00 +01:00
Laurent Destailleur
eca1e3a7e1 Look: Minor fix in themes 2013-01-07 17:57:39 +01:00
Laurent Destailleur
6d036699bb Qual: Uniformize usage of array module_parts. 2013-01-07 13:28:14 +01:00
Laurent Destailleur
b667400cc1 Fix: [ bug #618 ] External accounts can access confidential informations
(a lot)
2013-01-02 21:35:28 +01:00
Laurent Destailleur
96416735df Fix: [ bug #618 ] External accounts can access confidential informations
(a lot)
2013-01-02 18:43:59 +01:00
Laurent Destailleur
cd6e3464db Fix: Several fixes for bad management of external/internal users. 2013-01-02 14:35:16 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
a8012d0f18 Fix: [ bug #617 ] champs non repris lors d'une création de commande à
partir d'une propale
2012-12-27 18:02:36 +01:00
Laurent Destailleur
ba4be70a5e Fix: External user was not using correct menu handler. 2012-12-27 17:06:55 +01:00
Laurent Destailleur
78a1354a52 Fix: Solve phpunit regression.
Include an option to support local tax of type 7 (need more time to
validate this type).
2012-12-19 18:51:49 +01:00
Laurent Destailleur
11ab579639 Fix: Several fixes to avoid PDF lib conflicts. 2012-12-19 13:06:45 +01:00
Laurent Destailleur
752aabfc86 Fix: dynamic menu does not works with auguria. Add a temporary fix. 2012-12-17 23:19:48 +01:00
Regis Houssin
5f41174cfa Fix: bad path for photo and uniformize code 2012-12-13 11:42:59 +01:00
Laurent Destailleur
bdb112c820 Fix: Using bad root url. 2012-12-12 14:46:13 +01:00
Laurent Destailleur
f4459ee1f1 Fix: Regression detected by PHPUnit 2012-12-10 19:06:59 +01:00
fhenry
99f01f1dca [Task 632] : Add standard extra field feature for Agenda 2012-12-08 12:49:20 +01:00
Regis Houssin
f984b669b2 Fix: Fix: Use another method to help avoid having a space in value in
order to use this value with jquery
2012-12-07 13:48:11 +01:00
Regis Houssin
3d4621327c Fix: EOL !! tant que ce problème sera présent, les risques de problèmes
de merge et de conflits sera présent !! il faut utiliser la dernière
version d'Eclipse et de Egit...
2012-12-05 11:18:45 +01:00
Maxime Kohlhaas
954a578ebd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-12-05 09:10:55 +01:00
Regis Houssin
a0bed6c47f Fix: For avoid conflicts with external modules 2012-12-03 17:29:08 +01:00
Laurent Destailleur
d578d0be2b Perf: Log optimize. Saved 10KB of memory. 2012-12-02 14:33:24 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50
commits !
2012-12-01 15:45:05 +01:00
Maxime Kohlhaas
e45438994c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-12-01 14:36:51 +01:00
Christophe Battarel
46089bb03c also update ttc with global local taxes 2012-11-27 15:43:52 +01:00
Christophe Battarel
e87bb02323 retrieve global local taxes in update_price function 2012-11-27 15:34:46 +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
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
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
2d000b5df8 Fix: The default select choice was not selected when using jquery dialog
confirm boxes.
2012-11-20 12:23:32 +01:00
Maxime Kohlhaas
ec37a5e005 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-11-19 13:31:23 +01:00
Regis Houssin
8908f977b8 Fix: converting line delimiters !!! 2012-11-14 11:31:08 +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
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
5faa7fb075 Fix: for module name with number 2012-11-12 19:09:53 +01:00
Maxime Kohlhaas
7035ec42f1 Task # 559 : Modifications to store unitprice as in supplier prices 2012-11-07 00:38:53 +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
8896803921 New: We can use a dynamic value ($conf->global->XXX for example) into
titles of menus.
New: Can choose menu entry to show with external site module.
2012-11-04 21:19:12 +01:00
Laurent Destailleur
d3491e9ac0 Fix: Colors must be set into CSS. 2012-11-03 11:55:39 +01:00
Laurent Destailleur
dac97e2115 Fix: Do not try to show supplie ref if not defined. 2012-11-03 11:39:48 +01:00
Laurent Destailleur
5f3ceb0081 Fix: Label for payment by cheque using the wrong translation key
Fix: Option to overwrite translation did not work as expected
Fix: Bad translation for greece
2012-11-02 15:41:09 +01:00
Regis Houssin
b70af837df Fix: avoid warning 2012-10-31 09:59:24 +01:00
Maxime Kohlhaas
fa46923b3e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-10-30 08:06:29 +01:00
Regis Houssin
b952a7f9bf Fix: convert line delimiters (use the last eclipse version) 2012-10-28 13:57:21 +01:00
Regis Houssin
82cb0802d0 Fix: broken feature, missing $page
Fix: bad field name
2012-10-28 02:14:08 +02:00
Laurent Destailleur
a7e35a9308 Fix: If we exclude dirs, we must also clean array to avoid to count
them.
2012-10-27 20:02:09 +02:00
Maxime Kohlhaas
bed17951b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-10-27 15:59:40 +02:00
Laurent Destailleur
443f5ca03e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-27 00:23:54 +02:00
Laurent Destailleur
7a48351909 Fix: delete file from ecm module 2012-10-27 00:23:16 +02:00
Maxime Kohlhaas
fd5fb90649 Task # 559 : price defined on product page is unit price. Need to multiplicate this price by qty to have the right global price in the product list 2012-10-26 01:07:11 +02:00
Maxime Kohlhaas
fc7bc7e5d9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-10-26 01:00:22 +02:00
Maxime Kohlhaas
0f1617c31d Task 559 : add use of price by qty in product selection (select and ajax search) 2012-10-26 01:00:03 +02:00
Laurent Destailleur
cbff238cbd New: Support property "required" for extra fields. 2012-10-25 16:23:58 +02:00
Laurent Destailleur
7b92f66fab Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop
2012-10-25 13:17:35 +02:00
Laurent Destailleur
daeb1029a1 New: Support field required or not 2012-10-25 13:11:55 +02:00
Laurent Destailleur
d142dec69a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-25 12:45:01 +02:00
Regis Houssin
9d95e8bffb Fix: missing hookmanager 2012-10-25 11:44:04 +02:00
Laurent Destailleur
2953ef37e6 Methods works with most tables/elements 2012-10-25 10:06:29 +02:00
Laurent Destailleur
773b082b13 Fix: Restore private: The public method to use by external code is
addExtraField.
2012-10-24 21:28:24 +02:00
Regis Houssin
abb5047979 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-24 18:41:51 +02:00
Regis Houssin
5c78b2d5dd Fix: possibility to use this function in external module class 2012-10-24 18:41:22 +02:00
Laurent Destailleur
0d92fe2de1 Normalize code 2012-10-24 17:32:10 +02:00
Laurent Destailleur
2f4f427d9e Fix: ldap errors 2012-10-24 16:25:09 +02:00
Laurent Destailleur
1999452701 Fix: Avoid warnings 2012-10-23 23:49:16 +02:00
Regis Houssin
30430953de Fix: missing row and col parameters 2012-10-23 09:33:07 +02:00
Laurent Destailleur
ffa1b10061 doxygen 2012-10-19 14:45:00 +02:00
Laurent Destailleur
657d0197b6 Fix: json is a fuck... sh... 3 hours to find a bug ! (json fails
without any warning when converting non utf8 strings).
2012-10-18 16:30:12 +02:00
Laurent Destailleur
ef1e735ff9 Fix: doxygen 2012-10-17 17:19:28 +02:00
Laurent Destailleur
4a913cfb38 Merge pull request #449 from marcosgdf/odt-discounts
Created function to retrieve total discounted amount of a commonobject
2012-10-17 05:03:55 -07:00
Regis Houssin
26a5ac53d7 Fix: possibility to disable ajax 2012-10-16 16:10:23 +02:00
Laurent Destailleur
5dff8dbc6d New: Avoid horizontal scroll on standard resolution. 2012-10-15 23:13:28 +02:00
Marcos García
c9944a6b9b Created function to retrieve total discounted amount of a commonobject
Also added an ODT tag to let people add it to their invoices, etc..
2012-10-15 00:49:39 +02:00
Laurent Destailleur
153997432f Fix: Several fix.
New: Also allow to enter a payment with a negative value on an invoice
and positive onto other.
2012-10-13 17:00:38 +02:00
Laurent Destailleur
6046feda11 Restore border into PDF 2012-10-11 09:42:47 +02:00
Regis Houssin
478449da37 Fix: convert line delimiters 2012-10-08 20:47:10 +02:00
Regis Houssin
0975918cc6 Fix: [task #146] Remove table llx_categorie_association
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-10-08 19:27:02 +02:00
Laurent Destailleur
34f2402cb5 Qual: Removed dead code 2012-10-05 19:39:53 +02:00
Laurent Destailleur
bdb7becbc6 Fix: Try another fix on getTrad bug. 2012-10-04 09:44:04 +02:00
Laurent Destailleur
2159848490 Fix: getTradFromKey 2012-10-03 17:47:53 +02:00
Regis Houssin
fc1cc95d08 Fix: bad path 2012-10-03 08:54:21 +02:00
Laurent Destailleur
082ee53dae Fix: Miscellaneous fix in supplier product input 2012-10-02 00:30:23 +02:00
Laurent Destailleur
eec2a7b34e Merge pull request #429 from atm-maxime/mko559
Task # 559 : add discount on supplier prices
2012-10-01 13:31:17 -07:00
Maxime Kohlhaas
ed2a140046 Task # 559 : add display of discount in product list while adding line on supplier order 2012-10-01 11:45:28 +02:00
Regis Houssin
bcf46d00f0 Fix: convert line delimiters !! 2012-09-30 21:26:58 +02:00
Regis Houssin
d23188c64a Fix: doxygen 2012-09-30 20:49:13 +02:00
Regis Houssin
1919604089 Fix: more compatible with multicompany transverse mode
Fix: strict mode bubbles
2012-09-27 11:57:46 +02:00
Laurent Destailleur
0c1651dbf3 Doxygen 2012-09-23 22:02:44 +02:00
Laurent Destailleur
9bbe0e6b1c Qual: Mutuamize codeby using tpl.
New: Support unique field for extrafields
2012-09-22 20:27:06 +02:00
Laurent Destailleur
05e20b8f30 New: Can exclude some type of events 2012-09-20 00:42:51 +02:00
Grand Philippe
aa7cd880c0 fix: Warning : Invalid argument supplied for foreach() 2012-09-19 15:07:06 +02:00
Laurent Destailleur
1347ecf14e Qual: Removed warnings 2012-09-19 12:49:58 +02:00
Grand Philippe
2bcbd7dc2a fix: Warning : Invalid argument supplied for foreach() 2012-09-18 18:00:05 +02:00
Laurent Destailleur
4a98c08a74 Fix: Use correct date timezone. 2012-09-17 22:05:13 +02:00
Laurent Destailleur
df3227ef7e Migrate spain to localtax type. 2012-09-16 16:56:24 +02:00
Laurent Destailleur
d48f294531 New: [ task #289 ] Reorder tasks 2012-09-15 15:33:00 +02:00
Regis Houssin
43c0a03758 Fix: strict mode tornado 2012-09-15 11:21:22 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Regis Houssin
be13602c71 Fix: use getDocumentsLink method 2012-09-15 09:02:20 +02:00
Regis Houssin
968380ba3e Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-13 18:50:29 +02:00
Regis Houssin
f902fedbb8 Fix: split for more possibility 2012-09-13 17:43:24 +02:00
Laurent Destailleur
af5507bcfa Fix: restore correct behaviour. Space is output only if there is an img
+ text. img alone is not enough.
2012-09-13 16:13:12 +02:00
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
Regis Houssin
28e5ba6c18 Fix: mini strict mode 2012-09-12 18:47:06 +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
Christophe Battarel
8111909340 use selected value in contact type list + remove duplicate print statement 2012-09-12 12:55:45 +02:00
Regis Houssin
71d5191ff7 Fix: duplicate parameters 2012-09-12 10:46:35 +02:00
Regis Houssin
3e033ef48c Fix: doc 2012-09-11 17:09:43 +02:00
Regis Houssin
1d6645c5c4 Fix: rename this method 2012-09-11 17:08:29 +02:00
Regis Houssin
f95d611f12 New: add hooks in dol_delete_file and list_of_documents methods 2012-09-11 17:08:10 +02:00
Laurent Destailleur
a249061017 Fix: If object already loaded, the url was not returned. 2012-09-11 15:49:46 +02:00
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
Regis Houssin
7712b1c25f Merge pull request #385 from marcosgdf/translations
Improved translations
2012-09-10 20:30:25 -07: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
62b7ba607d Better practice
Replaced `empty($conf->global->MAIN_MODULE_BARCODE)` with `empty($conf->barcode->enabled)`
2012-09-10 23:23:25 +02:00
Marcos García
61e2596e4d Task #539 - Add new products into proposals,invoices... with barcode 2012-09-10 22:55:12 +02:00
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
9058439015 Fix: best practice 2012-09-09 16:17:19 +02:00
Laurent Destailleur
83cdb2167e Fix: Use bad parameter name 2012-09-09 15:23:09 +02:00
Laurent Destailleur
fcce22026a Fix: Bad name of var 2012-09-09 15:09:54 +02:00
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
Laurent Destailleur
221b671636 New: The signature feature is full ok now. 2012-09-06 19:07:51 +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
Regis Houssin
3823e5d374 New: add possibility to add or force default directories 2012-09-05 17:37:58 +02:00
Laurent Destailleur
d02076f8f2 Strict mode war 2012-09-05 14:41:45 +02:00
Laurent Destailleur
84438d82f4 Qual: Clean module 2012-09-05 12:59:33 +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
15db85bc86 Fix: prepare external extended ged 2012-09-03 21:00:46 +02:00
Laurent Destailleur
9eb21c3d9f Fix: Minot miscellanous fix 2012-09-03 10:17:58 +02:00
Regis Houssin
7e5971f2d1 Fix: missing conf max_file_size 2012-09-02 22:15:18 +02:00
Regis Houssin
afdab32bbf Fix: avoid warnings (strict mode) 2012-09-02 22:12:56 +02:00
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
1253683b83 Fix: edit of percentage 2012-09-02 14:11:07 +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
Laurent Destailleur
c7e7b67433 Fix: bad default vat calculation 2012-08-30 21:16:41 +02:00
Laurent Destailleur
cd9a6942ce Revert "Fix: add title"
This reverts commit f27821a657.
2012-08-30 20:28:43 +02:00
Regis Houssin
f27821a657 Fix: add title 2012-08-30 19:32:34 +02:00
Regis Houssin
8f21abfc5a Fix: Disabled if customer is not subject to VAT 2012-08-30 19:01:48 +02:00
Regis Houssin
327e51ccd9 Fix: more simple 2012-08-29 17:40:13 +02:00
Laurent Destailleur
2a800816d9 Merge pull request #356 from cbattarel/develop
modify margin management for global discount + correct bug (wrong consta...
2012-08-28 09:24:06 -07:00
Regis Houssin
526f0e310b Fix: convert line delimiters 2012-08-28 12:38:07 +02:00
Christophe Battarel
c1859d361a modify margin management for global discount + correct bug (wrong constant name) 2012-08-28 10:13:58 +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
Regis Houssin
10f9b53557 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-27 19:12:31 +02:00
Regis Houssin
3e2be54ead Fix: restore old method 2012-08-27 19:11:44 +02:00
Laurent Destailleur
29fa8b64c4 Checkstyle 2012-08-27 18:04:00 +02:00
Regis Houssin
07a10d3984 Fix: add compatibility with old static combobox 2012-08-27 17:18:46 +02:00
Laurent Destailleur
1c0303ea6b Fix: Restore broken feature. 2012-08-26 13:44:42 +02:00
Regis Houssin
f322ec50ed New: [ task #498 ] - final part 2012-08-25 15:21:34 +02:00
Regis Houssin
d88abe8df0 Fix: use label instead libelle 2012-08-25 12:07:18 +02:00
Regis Houssin
c9113458d9 New: [ task #498 ] part 3 2012-08-25 03:28:30 +02:00
Regis Houssin
6a60551fdd Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into task498_objectline

Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-08-23 17:19:05 +02:00
Regis Houssin
995c7f13d3 New: [ task #498 ] part3 2012-08-23 13:45:51 +02:00
Marcos García
19bf4ab8df Improvements to translations
Some available translations weren't being translated
Also corrected wrong translation key
Improved es_ES translation string
2012-08-23 08:29:38 +02:00
Regis Houssin
f4d75e87d3 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into task498_objectline

Conflicts:
	htdocs/core/class/commonobject.class.php
2012-08-23 07:53:48 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
ea119c45a2 Lower-cased all <?PHP 2012-08-22 23:27:53 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Regis Houssin
2ae1d3d3b5 New: [ task #498 ] 2012-08-22 17:42:40 +02:00
Regis Houssin
3c13395d21 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into task498_objectline 2012-08-20 12:10:20 +02:00
Regis Houssin
5dc10cfcae Fix: possibility to defined another value instead 50% 2012-08-20 10:38:48 +02:00
Regis Houssin
c6d008fb1b Fix: broken feature and add FIXME 2012-08-20 09:40:59 +02:00
Regis Houssin
1aa26d0cd7 Fix: missing show field if "in progress" is chosen first 2012-08-20 08:45:39 +02:00
Marcos García
344f379683 jQuerified events' javascript 2012-08-20 02:42:56 +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
a856ad0afa Fix: strict mode sunshine 2012-08-19 09:05:50 +02:00
Regis Houssin
b4e324a515 Fix: add ht and ttc fields 2012-08-18 19:05:59 +02:00
Regis Houssin
577a853b9b New: update field "qty" with minimum qty for this supplier price 2012-08-17 18:17:15 +02:00
Regis Houssin
7394525388 Fix: disable "add" button and show error message if a product with no
supplier price is selected
2012-08-17 16:58:57 +02:00
Regis Houssin
3438305169 FIXME: with ajax autocompleter, does not see the products that have no
supplier prices because they can be selected and it creates an error
message.
Fix: Do not make a "print" on "hook methods", just get the result
2012-08-17 15:16:07 +02:00
Regis Houssin
e1c009fce4 Fix: regression, formconfirm template can't use with variable content 2012-08-16 17:22:00 +02:00
Marcos García
c49e458c6c Propal stats weren't showing average total for more than 1 year 2012-08-14 15:43:14 +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
85f5033f47 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-08 04:12:48 +02:00
Laurent Destailleur
54c6db5b81 Qual: Uniformize code for pdf generation.
Refactoring of pdf code to make code cleaner and fix a lot of bug into
page breaks.
2012-08-08 04:12:20 +02:00
Laurent Destailleur
30444da6b9 Fix: autoselect when it should not 2012-08-07 18:55:55 +02:00
Laurent Destailleur
5ddd982f6e New: If field "signature" is filled into user table, text is added at
end of predefined email texts. If option MAIL_DO_NOT_USE_SIGN is on,
this feautre is disabled.
2012-08-07 16:55:14 +02:00
Laurent Destailleur
4d59ecb049 Fix: Missing condition 2012-08-05 21:06:48 +02:00
Regis Houssin
2884aac4bc Fix: delete pdf if supplier invoice is deleted
Fix: compatibility with external modules

Conflicts:
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
2012-08-05 18:36:20 +02:00
Regis Houssin
25662f9ecc Fix: compatibility with jquery fileupload 2012-08-05 18:32:59 +02:00
Laurent Destailleur
c247c710ec Qual: Uniformize code 2012-08-05 15:00:24 +02:00
Laurent Destailleur
e53e847083 Qual: Uniformize code 2012-08-05 14:37:45 +02:00
Laurent Destailleur
14bda09369 Removed deprecated not used method 2012-08-05 14:11:28 +02:00
Laurent Destailleur
6cf97a7317 Clean dead code 2012-08-03 14:18:48 +02:00
Laurent Destailleur
f1618bcaa7 Merge pull request #282 from marcosgdf/style
Refactor
2012-08-03 03:28:10 -07:00
Laurent Destailleur
233c47ef08 Merge pull request #286 from FHenry/develop
update select_contact method to add possibility to display contact
2012-08-02 07:45:50 -07:00
FHenry
799b1727f8 update select_contact method to add possibility to display contact
compagny also
2012-08-02 10:12:32 +02:00
Regis Houssin
e0385cf06f Fix: strict mode palace 2012-08-02 10:07:55 +02:00
Regis Houssin
e717f491c1 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-01 19:41:09 +02:00
Regis Houssin
5ad211a1ca Fix: bad document path with multicompany 2012-08-01 19:34:42 +02:00
Laurent Destailleur
07a09cad1d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-01 19:29:58 +02:00
Laurent Destailleur
b35240c899 Fix: Bad url 2012-08-01 19:29:36 +02:00
Regis Houssin
2e73cd7ddf Fix: missing fields and compatibility with milestone 2012-08-01 17:38:10 +02:00
Regis Houssin
29fea7bbf4 Fix: regression (multicompany) 2012-08-01 13:03:41 +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
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
77a5ef0b22 Fix: move ajax response in ajax directory 2012-07-29 10:24:42 +02:00
Regis Houssin
c7bacecf10 Fix: try to use another method for messages 2012-07-28 22:07:27 +02:00
Regis Houssin
9a80f0351d New: add phpmailer class 2012-07-28 19:11:05 +02:00
Raphaël Doursenaud
d34c4518d2 Removed BOM from UTF-8 files
Fix: convert line delimiters (regis)

Conflicts:
	htdocs/core/filemanagerdol/browser/default/js/common.js
	htdocs/core/filemanagerdol/browser/default/js/fckxml.js
2012-07-28 19:04:50 +02:00
Regis Houssin
251640561f Fix: strict mode happy hour 2012-07-28 12:35:11 +02:00
Regis Houssin
79181f9183 Fix: add external user filter 2012-07-26 18:24:54 +02:00
Regis Houssin
5318fb54d5 Fix: bad path 2012-07-26 17:07:10 +02:00
Regis Houssin
a6758c2557 Fix: use span instead div for align image warning 2012-07-26 11:34:43 +02:00
Laurent Destailleur
75e9d93e69 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-25 12:21:04 +02:00
Laurent Destailleur
dce9b96260 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/lib/repair.lib.php
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-07-25 12:20:45 +02:00
Regis Houssin
7d2f7e9800 Fix: strict mode crazy 2012-07-25 11:46:33 +02:00
Laurent Destailleur
758d613908 Fix: Checkstyle 2012-07-25 11:29:45 +02:00
Laurent Destailleur
276e32dc22 Fix: Products with no prices not visible 2012-07-25 11:27:25 +02:00
Regis Houssin
c6cd17cf3f Fix: strict mode... far away 2012-07-24 17:52:46 +02:00
Regis Houssin
d5ff308992 Fix: declare $mesg and $mesgs in main.inc.php
Fix: strict mode be back
2012-07-23 20:52:55 +02:00
Regis Houssin
fb23364511 Fix: uniformize code 2012-07-23 16:10:54 +02:00
Regis Houssin
bf807c27e5 Fix: uniformize code 2012-07-23 11:01:36 +02:00
Laurent Destailleur
087cf87722 New: Add state into substitution vars 2012-07-23 10:29:58 +02:00
Regis Houssin
fafd79a0f8 Fix: uniformize code (in progress) 2012-07-20 09:57:50 +02:00
Regis Houssin
b121a01ef8 Merge pull request #247 from cbattarel/marges
Margin module
2012-07-19 10:46:24 -07:00
Christophe Battarel
3844a77395 correct typing bugs 2012-07-18 16:06:36 +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
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
1831b46bae Fix: Do not show if module disabled 2012-07-17 14:30:10 +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
Regis Houssin
e1b0d183e4 Fix: add commonorder and commoninvoice classes 2012-07-11 18:13:41 +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
226caf0152 Fix: and again, and again, and again... (strict mode) 2012-07-10 13:20:53 +02:00
Regis Houssin
41144643eb Fix: avoid warning php strict mode 2012-07-10 11:45:38 +02:00
Regis Houssin
41789458c5 Fix: warning again and again... 2012-07-09 18:09:44 +02:00
Regis Houssin
66b2f630ac Fix: big avoid strict mode errors 2012-07-09 12:31:21 +02:00
Regis Houssin
cd7bf41ae0 Fix: php 5.4 strict mode warning 2012-07-09 10:08:56 +02:00
Regis Houssin
887f210618 Fix: avoid warning with php 5.4 and strict mode 2012-07-08 23:22:22 +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
2804ef2252 New: classify billed order if invoice billed (workflow
manager)
2012-07-08 14:18:40 +02:00
Regis Houssin
680fd32d23 Fix: missing parameters 2012-07-08 12:24:13 +02:00
Regis Houssin
69ebda8ddb Fix: regression corrected 2012-07-08 12:18:29 +02:00
Regis Houssin
fa8841c53f Fix: missing object 2012-07-07 12:26:46 +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
ca62c3dba8 Fix: compatibility with multicompany 2012-07-06 20:50:24 +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
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Regis Houssin
d593878c78 Fix: big problem with linked elements 2012-07-02 17:07:37 +02:00
Laurent Destailleur
693deca816 Fix: doxygen 2012-06-27 23:45:58 +02:00
Laurent Destailleur
787f423448 Fix: Removed warning. Fix compatibility. 2012-06-26 23:11:46 +02:00
Laurent Destailleur
0a75367a74 New: Auto ecm for third parties 2012-06-24 17:49:52 +02:00
Regis Houssin
2e22ac895f Fix: change smtps for have the same email structure of phpmail 2012-06-17 18:43:30 +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
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
c774d94bc9 Fix: Checkstyle 2012-06-10 13:15:24 +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
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
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
Laurent Destailleur
b120eb9a15 Fix: Confirm box not opened 2012-06-06 23:12:33 +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
93e3c3e3f3 Fix: merge array of hookmanager errors 2012-06-03 23:53:32 +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
2ad1cf0665 Fix: more clean code for new version of jQuery fileupload 2012-05-31 21:11:36 +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
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
3c98daaf09 More fix for canvas features 2012-05-30 03:46:06 +02:00
Regis Houssin
b5246add8d Fix: big problem with files upload and more compatible with external
modules
2012-05-30 00:07:06 +02:00
Laurent Destailleur
3fc3292142 Fix: delete of documents is done by page of element, not by the view
wrapper.
2012-05-29 23:50:13 +02:00
Regis Houssin
516be43404 Fix: jquery fileupload broken feature 2012-05-25 20:56:05 +02:00
Laurent Destailleur
f2c1346cb7 Fix: Removed warning 2012-05-24 23:22:45 +02:00
Laurent Destailleur
ed93e5cc7c Qual: Serious clean of code of formconfirm method. This also solve bugs
of ecm module when using ajax.
2012-05-23 23:23:57 +02:00
Laurent Destailleur
c6c9861bff Fix: bug on projects visibility for external users 2012-05-23 13:09:36 +02:00
Regis Houssin
01f1674231 New: add product admin page for mass conversion 2012-05-22 18:35:14 +02:00
Laurent Destailleur
04ee415879 Fix: [ bug #404 ] Impossible d'ajouter un contact lorsque le module LDAP
est actif (erreur Array 1)
2012-05-12 12:32:24 +02:00
Laurent Destailleur
13ea9c91fd Fix: Synchro with group not done when editing group only of a user. 2012-05-11 12:47:15 +02:00
Laurent Destailleur
3ab6ffdd0e Fix: A lot of fix for LDAP synchro 2012-05-11 12:10:47 +02:00
Laurent Destailleur
f995d0d9cb Fix: Missing extrafields
New: Can resiliate/edit member status from list.
2012-05-09 16:03:15 +02:00
Laurent Destailleur
0737748e48 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-07 18:59:17 +02:00
Laurent Destailleur
792c0a33f3 Fix: Works with checkbox htdocs/core/class/html.form.class.php 2012-05-07 17:04:35 +02:00
Laurent Destailleur
a8307a32fd New: Switch ecm module to use ajax by default. 2012-05-07 10:08:11 +02:00
Laurent Destailleur
50944a71db Checkstyle 2012-05-06 00:45:15 +02:00
Laurent Destailleur
d2672c4b39 Fix: setStatut works for user class 2012-05-05 20:22:46 +02:00
Laurent Destailleur
7bbacaece7 Fix: missing global 2012-05-01 14:09:58 +02:00
Regis Houssin
18c081a7ac New: add external theme with a module 2012-04-30 16:51:45 +02:00
Regis Houssin
73487a6aec Fix: replace mktime() by dol_now() 2012-04-30 15:01:25 +02:00
Laurent Destailleur
96a90e2e7a Fix: Overwritting code is not role of a template but of a module.
Code is now working as a module change. Also it is faster (no need to
make a failed include when module is not installed) and support
alternative directory.
2012-04-29 11:00:28 +02:00
Grand Philippe
922703879f to use specific tpl within his own theme 2012-04-28 18:24:52 +02:00
Laurent Destailleur
ff06360071 Fix: Overwritting code is not role of a template but of a module.
Code is now working as a module change. Also it is faster (no need to
make a failed include when module is not installed) and support
alternative directory.
2012-04-28 17:01:25 +02:00
Regis Houssin
bd0464b4db Merge pull request #174 from FHenry/develop
Remove Eclipse Warning (Undeclare variable)
2012-04-25 09:26:40 -07:00
Laurent Destailleur
afb79d5d2c Fix: [ bug #367 ] "Multi-tiers" fonctionality inverted in project
contacts.
2012-04-21 19:45:25 +02:00
FHenry
668bec3775 Remove Eclipse Warning (Undeclare variable) 2012-04-20 15:48:48 +02:00
Laurent Destailleur
062170b484 Fix: textarea field was not detected 2012-04-20 13:54:50 +02:00
Laurent Destailleur
afc53fefe9 Change to help to fight the mainmenu lost bug. 2012-04-20 13:07:53 +02:00
Laurent Destailleur
220d7a2c33 Fix: eldy theme still works without css3 2012-04-17 10:27:42 +02:00
Laurent Destailleur
9114fec4ed Doxygen 2012-04-16 12:01:32 +02:00
Laurent Destailleur
c876b6f2be Fix: debian epiphany and iceweasel browsers. 2012-04-14 03:20:10 +02:00
Regis Houssin
68e5229e9b Fix: missing langs object 2012-04-11 16:26:45 +02:00
Laurent Destailleur
0faa5d9196 Fix: this must not be used inside static classes 2012-04-11 14:44:54 +02:00
Laurent Destailleur
f1d1b0972f Bad comment 2012-04-11 13:29:23 +02:00
Laurent Destailleur
bc8d9d9d87 Fix: Removed warning 2012-04-10 12:38:10 +02:00