Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
43,247 Commits 36 Branches 189 Tags
6e545771675cbb6c5f3a5d865d37631bff17280b
Commit Graph

62 Commits

Author SHA1 Message Date
Laurent Destailleur
6e54577167 Better error management 2014-08-31 15:09:10 +02:00
Laurent Destailleur
0ccd29c6cd Doxygen 2014-08-30 20:05:16 +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
Laurent Destailleur
31c27b8f7c New: More option to define default filter setting of agenda views. 2014-06-29 23:35:00 +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
Florian HENRY
d2e2dabf26 Add showempty into combobox 2014-05-13 11:40:19 +02:00
Laurent Destailleur
131f133e07 New: Merge free product and predefined product area to enter new 
product (Supplier orders now use same template than customer
orders/proposal/invoices).
 2014-05-05 17:59:43 +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
8beaf30e88 Qual: Removed useless use of js 2014-04-27 01:51:31 +02:00
Raphaël Doursenaud
75eb98033f Qual: Fixed typo 2014-04-23 18:23:59 +02:00
Laurent Destailleur
bdb2b7a547 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/projet/index.php
	test/phpunit/FunctionsTest.php
 2014-03-13 09:20:05 +01:00
Gauthier
92e8f54e9a error on ajax_constantonoff function 2014-03-10 10:53:20 +01:00
Laurent Destailleur
ead7df3306 Add backslash 2014-02-13 10:54:03 +01:00
Laurent Destailleur
aad7885bca Fix: [bug #1226 ] page ne se charge pas quand beaucoup de prospect en 
base
 2014-02-08 02:35:59 +01:00
Laurent Destailleur
d8b8f8c646 Uniformize code for contacts forms. 2014-02-04 20:49:07 +01:00
Laurent Destailleur
89ebb3c0ef New: Add option MAIN_DISABLE_AJAX_COMBOX 2014-02-03 19:47:35 +01:00
Laurent Destailleur
bdf8100d84 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/product/stats/commande_fournisseur.php
 2013-11-28 15:54:12 +01:00
Laurent Destailleur
48570f599a Fix: form is not allowed into a table. This break some javascript and 
make some browsers crazy.
 2013-11-17 23:25:25 +01:00
Laurent Destailleur
dd0612099c Qual: Uniformize fields departement_id into state_id 2013-09-20 14:35:58 +02:00
Marcos García
bf2d61515d CR fix 
Git required me to commit these changes
 2013-06-16 21:33:05 +02:00
Laurent Destailleur
fee958eafb Add comments 2013-06-16 12:23:00 +02:00
fhenry
c109467d20 Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse... 2013-04-04 13:58:33 +02:00
Laurent Destailleur
08be243dc4 Optimize with smartphone 2013-04-03 00:36:31 +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
a6378ab0bb Cleaner HTML code 2013-02-24 18:08:27 +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
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
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
7a48351909 Fix: delete file from ecm module 2012-10-27 00:23:16 +02:00
Regis Houssin
d2ae90f938 Fix: strict mode everywhere 2012-09-02 22:48:52 +02:00
Regis Houssin
e36af3085a New: add possibility to have a confirm dialog box with on/off buttons 
Qual: move some functions in lib_head.js
 2012-09-02 22:18:06 +02:00
Regis Houssin
a00205a17d New: add possibility to set and del anothers constants 2012-09-02 22:06:03 +02:00
Regis Houssin
13d46da3fe Fix: clear old data before update 2012-08-29 18:01:00 +02:00
Regis Houssin
327e51ccd9 Fix: more simple 2012-08-29 17:40:13 +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
6426ef3f8d Fix: add test for instance 2012-08-27 14:08:59 +02:00
Regis Houssin
fb866d9106 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_add.tpl.php
 2012-08-27 13:33:31 +02:00
Regis Houssin
2f14fbe791 Fix: debug ckeditor and VAT 2012-08-27 13:27:27 +02:00
Laurent Destailleur
0bdb9aac31 Fix condition of usage of ckeditor 2012-08-27 13:07:25 +02:00
Regis Houssin
efa471b12b Fix: test if ckeditor is enabled 2012-08-26 21:47:56 +02:00
Regis Houssin
2ae1d3d3b5 New: [ task #498 ] 2012-08-22 17:42:40 +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
fafd79a0f8 Fix: uniformize code (in progress) 2012-07-20 09:57:50 +02:00
Christophe Battarel
0cdf208f3d trigger change event when updating item value 2012-07-18 15:17:04 +02:00
Regis Houssin
ff0668e908 Fix: strict mode way 2012-07-10 22:10:12 +02:00