Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
56,402 Commits 36 Branches 189 Tags
bcd3a1a888978fb3c65df4593735b51d1ed0f642
Commit Graph

126 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