Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
93,485 Commits 36 Branches 189 Tags
26fa8b45ac26fa85a5757c26fb306e0167e60ae5
Commit Graph

2099 Commits

Author SHA1 Message Date
Laurent Destailleur
26fa8b45ac Merge pull request #15153 from FHenry/dev_new_add_desc_when_select_product 
NEW: preload product description on selection for customer propal/order/invoice
 2021-01-07 11:19:53 +01:00
Laurent Destailleur
4f55d51eac Merge pull request #15886 from FHenry/dev_add_column_propal_order 
NEW : Column shippement method, payment mode, payment term in propal and order list
 2021-01-07 11:04:30 +01:00
Laurent Destailleur
c2855d4d71 Update html.form.class.php 2021-01-07 10:32:23 +01:00
ATM john
dd19da66b2 fix stickler 2021-01-06 17:33:19 +01:00
ATM john
ae7b8e7f5e Fix unit selection on object edit line 2021-01-06 15:15:51 +01:00
Florian HENRY
6e7172887a Merge branch '13_backport' into dev_add_column_propal_order 2021-01-05 22:58:00 +01:00
Florian HENRY
b9bb48a01f better place and noadmininfo 2021-01-05 22:50:54 +01:00
Laurent Destailleur
8baa4c67ae Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-04 12:34:09 +01:00
Laurent Destailleur
b0738643fb FIX Solve problem with TZ 2021-01-03 18:42:45 +01:00
Florian HENRY
dfaf77b03f merge develop 2021-01-03 15:14:34 +01:00
Frédéric FRANCE
b71e837ddd clean code 2021-01-02 10:18:58 +01:00
Frédéric FRANCE
2894dac221 clean code 2021-01-02 10:17:11 +01:00
Laurent Destailleur
0241817217 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-01 21:12:36 +01:00
Laurent Destailleur
d834f6023d Fix rounding 2020-12-31 16:06:54 +01:00
Alexandre SPANGARO
9f0434eb69 Merge remote-tracking branch 'upstream/develop' into 14a2 2020-12-29 04:50:32 +01:00
Laurent Destailleur
4471d7d1da FIX debug report expense/income 2020-12-23 22:18:38 +01:00
Laurent Destailleur
940f0484ee FIX debug report expense/income 2020-12-23 22:17:05 +01:00
Laurent Destailleur
8d21eab6ab Fix buttond not working 2020-12-20 06:06:24 +01:00
Laurent Destailleur
3b8947dadd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/price.php
 2020-12-17 21:50:05 +01:00
Laurent Destailleur
f10c69680c Ajax combo at a better place (after select) 2020-12-17 21:42:10 +01:00
Laurent Destailleur
2ae1aac5a4 Fix setup 2020-12-15 11:18:29 +01:00
Laurent Destailleur
18efbebd02 css 2020-12-11 17:11:50 +01:00
Laurent Destailleur
ab0b508984 Merge pull request #15720 from zuiko/patch-1 
V13 Update html.form.class.php to complete Fix #15565 Enhanced behaviour to select product on customer/supplier order to be able to use barcode reader efficiently
 2020-12-11 16:31:19 +01:00
Laurent Destailleur
8a0c065163 Debug v13 2020-12-11 16:30:45 +01:00
Frédéric FRANCE
54d51ec557 Update html.form.class.php 2020-12-11 13:46:47 +01:00
Frédéric FRANCE
eb2d7fa657 fix phpcs 2020-12-11 13:43:03 +01:00
Laurent Destailleur
697ca3e4f5 Fix selection of duration type 2020-12-11 02:23:43 +01:00
Laurent Destailleur
df4d2e1b24 Fix path of user photo 2020-12-10 18:13:30 +01:00
zuiko
b3ca58d2d0 Update html.form.class.php 
Complete the Fix to #15565 Enhanced behaviour to select product on customer/supplier order to be able to use barcode reader efficiently.
Answer to Eldy, https://github.com/Dolibarr/dolibarr/pull/15704#discussion_r538763166
In fact the change alone to htdocs/core/lib/ajax.lib.php  is not, for me, sufficient to fix the issue.
if $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, the combo remains even if the product is alone.
So I recommend that the code is $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, (wihout combo) for product selection only for customer order filling because for this usage the the probability is higher to use a barcode scanner.
It is less relevant for filling supplier orders (which are not usually entered by barcode scanner), because the combo gives verification information which then disappears. (This is especially true for the purchase price, which is not pre-filled in the box for the moment I tested(?).
 2020-12-09 21:16:25 +01:00
Laurent Destailleur
769a8886b9 Debug notification on events 2020-12-08 20:32:37 +01:00
Laurent Destailleur
1f83e22aea Fix set of translation of website page during cloning 2020-12-06 15:59:19 +01:00
Laurent Destailleur
f0dec80dae css 2020-12-04 15:39:30 +01:00
Laurent Destailleur
040d22ef0a Fix phpcs 2020-12-04 01:59:47 +01:00
Laurent Destailleur
5bd6d6f388 Look and feel v13 2020-12-03 14:34:15 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
Laurent Destailleur
2707c0b89b Look and feel v13 2020-11-30 20:13:42 +01:00
Laurent Destailleur
3443174f67 Sync transifex 2020-11-30 18:28:04 +01:00
Laurent Destailleur
bd5dc6399b Fix deprecated code 2020-11-30 12:35:05 +01:00
Laurent Destailleur
150dd71774 Look and feel v13 2020-11-29 16:02:39 +01:00
Laurent Destailleur
404634919d Look and feel v13 2020-11-29 15:47:08 +01:00
Laurent Destailleur
6c65ebef0d Look and feel v13 2020-11-29 15:16:53 +01:00
Laurent Destailleur
97f6efb079 Fix avoid to trigger sql injection detection 2020-11-26 23:50:00 +01:00
Laurent Destailleur
5d9098795f Fix labels in combo 2020-11-26 19:17:09 +01:00
lvessiller
17e13eb821 NEW show stock in supplier product select list 2020-11-26 14:12:02 +01:00
Laurent Destailleur
74605cec12 Fix warning 2020-11-25 18:07:52 +01:00
Laurent Destailleur
bc1d286673 Merge pull request #15495 from Givriz/dev 
Feature : creation of a "button-cancel" class
 2020-11-23 21:53:45 +01:00
Laurent Destailleur
efc539c4b4 Fix css 2020-11-23 19:53:58 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel" 
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
 2020-11-23 15:12:52 +01:00
Laurent Destailleur
986f918436 Fix image edition when gravatar module is on 2020-11-22 01:47:17 +01:00
Laurent Destailleur
3534555909 Fix setup of scheduled jobs 2020-11-21 14:14:53 +01:00