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

326 Commits

Author SHA1 Message Date
Laurent Destailleur
bcd055b378 Move button to link to, in same part of code than code to output links. 2016-08-05 15:30:28 +02:00
Laurent Destailleur
e168888c59 NEW Reduce nb of picto on ref into list, merging preview and download 2016-08-05 12:20:11 +02:00
Laurent Destailleur
7211542e41 Merge pull request #5569 from olsesacl/develop-show-preview-documents 
NEW Preview documents
 2016-08-05 01:13:35 +02:00
Laurent Destailleur
f0c75388cb Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/api_commande.class.php
	htdocs/compta/facture/class/api_invoice.class.php
	htdocs/product/class/api_product.class.php
	htdocs/societe/class/api_contact.class.php
	htdocs/societe/class/api_thirdparty.class.php
 2016-08-02 17:43:12 +02:00
Sergio Sanchis Climent
5fe0d601da New: Preview documents 2016-08-02 03:35:22 +02:00
Laurent Destailleur
a02c539a82 FIX #5521 2016-08-01 15:53:51 +02:00
Laurent Destailleur
00118610bb A fix to make editinplace working better 2016-07-28 15:29:46 +02:00
Laurent Destailleur
968827172d FIX #5534 2016-07-27 18:49:34 +02:00
Laurent Destailleur
00749b2a65 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/imports/import.php
	htdocs/includes/odtphp/odf.php
	htdocs/product/stock/product.php
	htdocs/projet/list.php
 2016-06-22 20:22:22 +02:00
Laurent Destailleur
d717757594 Protect against bad value of accurancy to avoid javascript error 2016-06-17 10:40:11 +02:00
Laurent Destailleur
a3d53b269f FIX javascript error with german-switzerland language 2016-06-17 10:35:18 +02:00
Laurent Destailleur
5b5b7a2bf9 FIX Bad value used for task warning delay 
FIX Compatibility datee and date_end for warning of tasks
 2016-06-15 14:05:48 +02:00
Laurent Destailleur
a83a291856 Translation for one char 2016-05-12 19:55:36 +02:00
Laurent Destailleur
e1da95871a Fix bad name 2016-02-05 12:23:16 +01:00
fappels
51b08f579b Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse 
Fix Conflicts:
 2016-01-12 13:56:00 +01:00
Laurent Destailleur
1ae4bef04b Fix conflict with the div #dialog used for popup cut and paste of 
address.
 2016-01-02 00:27:14 +01:00
Florian HENRY
930eb6dccf FIX : bug with head.lib.js if MAIN_MAX_DECIMALS_SHOWN use ... 
FIX : List of supplier order to invoice must use billed new column
 2015-12-23 14:15:30 +01:00
fappels
7fc8007571 New add shipping and dispatching from/to multiple warehouses 
Add select2 to warehouse selectors
Ship customer orderline from multiple warehouses
Dispatch client orderline to multiple warehouses
 2015-12-18 18:00:31 +01:00
Laurent Destailleur
40269c3c70 Fix Remove syntax warnings 2015-12-15 09:43:39 +01:00
Raphaël Doursenaud
3e2309d0e6 NEW Factorized price2numjs into lib_head.js.php 
Used public domain code from the MDN to provide a robust decimal
rounding implementation.

Warning for developers: the path of the javascript file has changed.
Please update your scripts.
 2015-12-10 17:03:00 +01:00
Sof
daa8399764 FIX: Cannot set property '_renderItem of undefined 
http://stackoverflow.com/questions/9513251/cannot-set-property-renderitem-of-undefined-jquery-ui-autocomplete-with-html
 2015-11-30 20:31:42 +01:00
Laurent Destailleur
64c783623b NEW Framework feature. To have a page being loaded at same scrollbar 
level wafter a click on a href link, just add the class "reposition" on
this link.
 2015-11-13 03:35:55 +01:00
Laurent Destailleur
055fe5e275 FIX #3786 Translation of select box. 2015-11-02 19:17:22 +01:00
Maxime Kohlhaas
84be022ee1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into check_rejection 
Conflicts:
	htdocs/compta/paiement/cheque/card.php
 2015-07-02 13:45:32 +02:00
Laurent Destailleur
dc050d39eb Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/adherents/type.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/js/lib_batch.js
	htdocs/core/modules/modUser.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/societe/consumption.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
	htdocs/user/perms.php
 2015-06-29 00:09:28 +02:00
Maxime Kohlhaas
175cffbec8 Debug : calendar must always be displayed on top of other layers 2015-06-26 16:59:19 +02:00
Francis Appels
63df278eca Fix: issue #3085 2015-06-23 19:28:18 +02:00
Laurent Destailleur
a3a5b0d9b0 Upgrade jquery and jquery-ui to last stable version 2015-06-21 00:06:37 +02:00
Laurent Destailleur
bfc8ccd761 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-19 11:19:23 +02:00
Laurent Destailleur
20da120a49 Merge tab to upload photo and other files to same tab. This reduce 
duplicate code and avoid users to be lost.
 2015-06-19 11:19:13 +02:00
Marcos García de La Fuente
1e05262884 Corrected Timezone detection by using jstz external library 2015-06-16 21:19:58 +02:00
Laurent Destailleur
56a14da5d4 FIXME that are not bug are replaced with TODO 
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
 2015-04-12 04:01:28 +02:00
Laurent Destailleur
5d4d8151c1 Work on new timesheet input pages. 2015-03-18 11:04:50 +01:00
Laurent Destailleur
107a16ed75 Work on timesheet module 2015-03-04 00:53:35 +01:00
Laurent Destailleur
179cbbd187 Maxi debug and enhancement of module batch. 2015-02-11 22:54:06 +01:00
Laurent Destailleur
429cae5d2e Recherche bug travis 2014-11-07 23:58:30 +01:00
Regis Houssin
3ab8b6f7d1 New: add possibility to define a custom error message 2014-09-26 09:44:21 +02:00
Regis Houssin
e713c8dadc Fix: broken feature: add param for use only "disabled" with delConstant 
and "enabled" with setConstant
 2014-08-17 15:20:43 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Laurent Destailleur
bf96a78f63 Try a fix when timezone string is not standard 2014-07-04 13:07:53 +02:00
Laurent Destailleur
8d1fdec8cf Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/fiche.php
	htdocs/projet/fiche.php
 2014-06-20 15:26:02 +02:00
Florian HENRY
0f77fbaea2 Fix [ bug #1349 ] AJAX contact selector does not work fine in Project 
card
 2014-06-17 11:18:30 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
9a320cc50f Removed a function we should not have. 2014-04-25 20:18:26 +02:00
Raphaël Doursenaud
79fe0a1658 Qual: Prevent potential JS injection 2014-04-23 15:20:45 +02:00
Laurent Destailleur
ce4c78972a Fix: Image always fit into window when using cropping feature even if 
file is a very large file.
 2014-03-18 23:24:00 +01:00
KreizIT
3782742aad - add batch management on supplier dispatch product 
- SECURITY FIX : replace $_GET and $_POST by GETPOST in dispatch.php
 2014-03-15 10:28:01 +01:00
Laurent Destailleur
8c9d2418d2 Qual: Move common javascript function into lib_head.js 2014-02-19 11:08:43 +01:00
Laurent Destailleur
45aac81b71 Doc: More comments 2013-11-16 18:12:13 +01:00
Raphaël Doursenaud
9faa832560 Wrong var 2013-11-07 22:11:43 +01:00
Raphaël Doursenaud
ae36934746 Fixed bad copy-paste 2013-09-06 10:22:13 +02:00
Raphaël Doursenaud
d39f2d655c Typo fix: remove unwanted comma 2013-09-05 20:28:24 +02:00
Raphaël Doursenaud
109cc09e82 Simplified JS 2013-09-05 16:37:23 +02:00
Florian Henry
3db195cb48 [ bug #971 ] html.form.class.php select_contact with autocomplete do not 
exclude id from exclude array
 2013-07-08 12:51:17 +02:00
Laurent Destailleur
9729e83e66 Fix: Do not use deprecated function 
New: ajax constant on off can be reversed
 2013-03-13 23:05:34 +01:00
Laurent Destailleur
180fb2c91a Fix: Option COMPANY_USE_SEARCH_TO_SELECT was not working for third party 
selection when autocomplete is on.
 2013-01-29 15:22:07 +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
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +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
Regis Houssin
1722db223a Fix: add timepicker default options 2012-11-03 20:41:59 +01:00
Regis Houssin
634b5f7d1b Fix: image is hard defined 2012-10-31 15:50:14 +01:00
Laurent Destailleur
7a48351909 Fix: delete file from ecm module 2012-10-27 00:23:16 +02:00
Regis Houssin
89b794dcd0 Fix: avoid errors with IE 2012-10-25 15:01:04 +02:00
Regis Houssin
30430953de Fix: missing row and col parameters 2012-10-23 09:33:07 +02:00
Regis Houssin
678e006121 Fix: for test 2012-09-04 20:46:08 +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
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
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
4332c341bf Fix: check if textarea is not empty for free lines 2012-08-28 12:36:35 +02:00
Regis Houssin
2f14fbe791 Fix: debug ckeditor and VAT 2012-08-27 13:27:27 +02:00
Regis Houssin
995c7f13d3 New: [ task #498 ] part3 2012-08-23 13:45:51 +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
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
1c97934f6d Fix: test if ckeditor is enable 2012-07-03 16:42:04 +02:00
Regis Houssin
df28f09286 Fix: mutualize ckeditor parameters 2012-06-12 23:13:25 +02:00
Laurent Destailleur
e0b6bee540 New: Add timezone string from browser. 2012-05-15 01:41:12 +02:00
Laurent Destailleur
0b71aceb90 New: Each user can remove/add its own boxes. 2012-03-19 14:06:21 +01:00
Regis Houssin
993b5eefaf Fix: wrong blank space for jquery combobox 
Fix: uniformize code
 2012-03-15 10:14:54 +01:00
Regis Houssin
dec582843b Fix: try to use jeditable autocomplete (not stable) 2012-03-12 16:39:53 +01:00
Regis Houssin
2048c88975 Fix: try jeditable autocomplete 2012-03-12 23:12:58 +08:00
Regis Houssin
0b67e88f08 Fix: problem if more than one element of the same type 2012-03-12 21:38:28 +08:00
Regis Houssin
616698889c Fix: move script to js core file 2012-03-09 18:21:11 +01:00
Regis Houssin
94f6034f9a New: adding the ability to display a different value than the original 
value, in the edit in place fields
 2012-02-22 22:05:20 +08:00
Regis Houssin
fa3e134a92 Fix: add specific right access for payment 
New: add possibility to defined success message for jeditable
 2012-02-20 20:31:35 +01:00
Regis Houssin
ff59631e11 Fix: works on edit in place with external modules 2012-02-07 16:56:08 +01:00
Regis Houssin
cd066b825a Fix: rename 'text' to 'string' 2012-02-06 17:29:19 +01:00
Laurent Destailleur
3f495ef3b5 Qual: Removed not used file 
Qual: Update licence header
 2011-11-12 00:54:32 +01:00
Regis Houssin
8f1154f400 Fix: timestamp field name problem 2011-11-11 12:42:37 +01:00
Regis Houssin
8072f501ff Works on extend edit in place with external modules (in progress) 
Conflicts:

	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
 2011-11-09 17:13:25 +01:00
Regis Houssin
cbec43e098 Fix: change 'editfieldkey' and 'editfieldval' for compatibility with 
external module and hook system.
Fix: uniform code
 2011-11-09 06:14:42 +08:00
Regis Houssin
94b393e760 Fix: show icon if edit in place is possible 2011-11-05 22:32:25 +01:00
Regis Houssin
4482c6ac0a Fix: change for external modules 
Fix: add osx files in gitignore
 2011-11-05 00:24:13 +08:00
Regis Houssin
9f4ab4c1b1 Fix: css problem 
New: add change year and month in jQuery datepicker
 2011-10-31 18:38:17 +01:00
Regis Houssin
d9eb4cbeb9 New: add edit in place with ckeditor 
Fix: remove unused jQuery plugin ckeip
 2011-10-31 16:57:10 +01:00
Regis Houssin
419eb248c1 Fix: add generic edit in place select input 2011-10-31 14:34:11 +01:00
Regis Houssin
2aaf7552c0 Fix: optimize code 2011-10-31 10:21:32 +01:00
Laurent Destailleur
a7fbe00d4e Fix: type must be text/javascript 2011-10-31 01:03:59 +01:00
Laurent Destailleur
3d3c7a2223 Set day of week 2011-10-31 00:32:55 +01:00
Laurent Destailleur
d0711215ab Complete locales 2011-10-30 23:51:07 +01:00
Laurent Destailleur
c3aafe05a8 Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/js/datepicker.js.php
 2011-10-30 23:43:39 +01:00
Laurent Destailleur
a508d18693 Set other locales. 2011-10-30 19:38:01 +01:00
Regis Houssin
64f3401658 Fix: translation 
Fix: remove translation treatment
 2011-10-30 19:29:11 +01:00
Regis Houssin
a20a83fce6 Fix: use another method 2011-10-30 19:05:01 +01:00
Regis Houssin
41f265d8be Add TODO for add specific parameters for country 2011-10-30 18:59:36 +01:00
Laurent Destailleur
0c3e604de0 Fix: Missing closing db 2011-10-30 18:58:30 +01:00
Regis Houssin
a08352633d Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-10-30 18:56:16 +01:00
Regis Houssin
3daf797d3f Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-10-30 18:55:07 +01:00
Laurent Destailleur
5f6b52a7e5 Force charset 2011-10-30 18:55:00 +01:00
Laurent Destailleur
ef0fac8000 Force type javascript 2011-10-30 18:48:40 +01:00
Laurent Destailleur
415c04e827 Qual: Move init of vars for old datepicker into new js script file. 2011-10-30 18:34:36 +01:00
Laurent Destailleur
7e1715d025 Avoid having duplicate translations 2011-10-30 18:24:59 +01:00
Regis Houssin
8dc1a20466 Add jeditable select and autocomplete (not stable) 2011-10-29 23:42:24 +02:00
Regis Houssin
a20d0e7699 Fix: add datepicker default options and just rename datepicker language 
options
 2011-10-28 22:06:57 +02:00
Regis Houssin
dea1210c2d Fix: edit in place datepicker more stable 2011-10-28 19:31:42 +02:00
Regis Houssin
75340e4b74 Fix: use i18n files for datepicker 2011-10-28 17:48:39 +02:00
Regis Houssin
4ebbc0de6f Fix: rename "area" to "textarea" 
New: add js files for default datepicker options
New: add edit_datepicker for edit in place (not stable)
 2011-10-28 16:28:55 +02:00
Regis Houssin
bc6fa60287 Fix: move jnotify options in separate file 
Fix: move nl2br treatment
New: add error message for edit in place
 2011-10-28 12:02:36 +02:00
Regis Houssin
1464929fed Fix: load only textarea for nl2br 2011-10-27 18:55:07 +02:00
Regis Houssin
1137b69a03 Fix: use loadurl just for textarea and numeric 2011-10-27 18:17:27 +02:00
Regis Houssin
df19c5e606 Fix: move ajax tpl to js for uniform code 2011-10-27 18:06:05 +02:00
Regis Houssin
ed28394df8 Add empty index file 2011-10-24 10:33:55 +02:00
Regis Houssin
b1271a5398 Move core js in /htdocs/core/js 2011-10-24 09:36:58 +02:00