lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
104,043 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-3
Commit Graph

5431 Commits

Author SHA1 Message Date
Laurent Destailleur
feb2e71f0c Fix regression 2021-08-28 18:59:12 +02:00
Laurent Destailleur
8ab9c96b7e Fix 0 insert instead of null 2021-08-28 18:56:48 +02:00
Laurent Destailleur
e2eaa9b46e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-28 18:54:48 +02:00
Laurent Destailleur
5f08ed84f8 Fix 0 insert instead of null 2021-08-28 18:53:57 +02:00
Laurent Destailleur
97ee69e88f Fix 0 insert instead of null 2021-08-28 18:52:43 +02:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons 
replace remaining SubmitCancel buttons
 2021-08-28 18:39:06 +02:00
Laurent Destailleur
978511e127 Update fournisseur.facture.class.php 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2021-08-28 17:59:45 +02:00
Laurent Destailleur
5ec286fdb7
Merge pull request #18500 from francisbesset/fix-fk_unit 
Fix bad comparison for fk_unit to avoid always null value for all case
 2021-08-28 17:57:26 +02:00
Laurent Destailleur
97064f1550
Update fournisseur.facture.class.php 2021-08-28 17:55:49 +02:00
Laurent Destailleur
301d7134b3
Merge branch 'develop' into patch-2 2021-08-28 17:37:54 +02:00
stickler-ci
63427638d8 Fixing style errors. 2021-08-28 14:54:16 +00:00
henrynopo
444786b34f
Update card.php 2021-08-28 22:52:06 +08:00
Laurent Destailleur
0db67b40a0
Merge pull request #18525 from cfoellmann/PR/thirdparty-links 
change links for thirdparty to target the type customer|supplier tab
 2021-08-28 15:27:13 +02:00
BENKE Charlene
afb8a86aff
Clean code (line in double) 2021-08-28 14:14:48 +02:00
Laurent Destailleur
3d72a21396 Clean code 2021-08-28 03:09:41 +02:00
Laurent Destailleur
29abbbe2fb Clean code 2021-08-28 01:45:53 +02:00
Laurent Destailleur
51a4d7630f Clean code 2021-08-28 00:56:37 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Christian Foellmann
9752501ef6 change links for thirdparty to target the type customer|supplier tab 2021-08-27 15:32:53 +02:00
Christian Foellmann
9914ebe90b add missing actions to admin page 2021-08-27 10:21:02 +02:00
henrynopo
054b466e0a
Update card.php 2021-08-26 09:40:44 +08:00
Francis Besset
22ec43f4a3 Fix bad comparison for fk_unit to avoid always null value for all case 2021-08-25 13:46:18 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Laurent Destailleur
90c12ae340 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-24 16:37:42 +02:00
Laurent Destailleur
07ab352877 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
 2021-08-24 16:37:18 +02:00
Laurent Destailleur
76c3f10842
Merge pull request #18438 from aspangaro/15a4 
NEW Supplier order - Add From/to input on search date
 2021-08-24 15:53:15 +02:00
Laurent Destailleur
1c665c34cd
Merge pull request #18485 from fappels/14_fix_supplier_order_card 
Fix warning on supplier order card when reception enabled.
 2021-08-24 15:31:05 +02:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function 
improve forms - buttonsSaveCreate()
 2021-08-24 15:26:03 +02:00
henrynopo
73c0471ead Fix error of supplier invoice (variable amount) 
This update fixed the coding error for addline of deposit invoice for variable amount.

In addition, there is no invoice template for supplier invoice, so I also corrected the respective description.
 2021-08-24 15:12:15 +02:00
Laurent Destailleur
c3fe1bfdc0
Merge pull request #18459 from henrynopo/patch-9 
Fix error of supplier invoice (variable amount)
 2021-08-24 15:09:53 +02:00
Laurent Destailleur
67baa48c16 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/fourn/facture/list.php
 2021-08-24 14:56:13 +02:00
Laurent Destailleur
6fa5930e8d Fix label must not be translated 2021-08-24 14:54:46 +02:00
Laurent Destailleur
b10f75932f
Merge pull request #18466 from aspangaro/14p16 
FIX Supplier invoice list - Wrong language key used
 2021-08-24 14:51:46 +02:00
henrynopo
3c1bdd163f
Update paiementfourn.class.php 2021-08-24 18:34:34 +08:00
Francis Appels
edeaa6009f Fix warning on supplier order card when reception enabled. 2021-08-24 10:48:26 +02:00
Laurent Destailleur
a6ddc90d5b Fix responsive 2021-08-23 23:53:58 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-08-23 19:44:02 +02:00
Laurent Destailleur
8485fee5f9 Cast numeric into on sql request 2021-08-23 19:33:24 +02:00
Laurent Destailleur
23829ae637 Cast numeric into on sql request 2021-08-23 18:56:46 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Alexandre SPANGARO
b5a4c58106 FIX Supplier invoice list - Wrong language key used 2021-08-22 22:42:40 +02:00
henrynopo
b4096dc057
Fix error of supplier invoice (variable amount) 
This update fixed the coding error for addline of deposit invoice for variable amount.

In addition, there is no invoice template for supplier invoice, so I also corrected the respective description.
 2021-08-22 13:26:46 +08:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Alexandre SPANGARO
797372cac2 NEW Supplier order - Add From/to input on search date 2021-08-18 22:30:33 +02:00
Laurent Destailleur
ae28dad72e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 18:08:40 +02:00
Laurent Destailleur
955e9de1b7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/reassortlot.php
	htdocs/product/stock/product.php
	htdocs/product/stock/productlot_card.php
	htdocs/reception/card.php
 2021-08-17 18:07:10 +02:00
Laurent Destailleur
c0a086fad8 Sellby always before Eatby #18361 2021-08-17 17:55:00 +02:00
stickler-ci
ee65860b27 Fixing style errors. 2021-08-16 01:45:33 +00:00
henrynopo
76c39a86a0
Supplier Invoice - Multicurrency remainder to pay 
Added multicurrency remainder to be paid.
 2021-08-16 09:44:09 +08:00
Maxime Kohlhaas
96a820476c Fix supplier invoice clone : missing data on lines (#18055) 2021-08-13 10:45:43 +02:00
Laurent Destailleur
d7317025e9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/pdf_other.php
 2021-08-11 22:09:05 +02:00
Laurent Destailleur
ef4468153d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-08-11 22:07:13 +02:00
Laurent Destailleur
0cf2164260 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-08-11 21:15:30 +02:00
Gauthier PC portable 024
087e269103 FIX : on supplier order, JOIN with product fourn price table must be done with fk_soc too to avoid display several times a same line (because of same supplier product ref) 2021-08-10 17:34:47 +02:00
Laurent Destailleur
a4843f7d10
Merge pull request #18176 from ATM-Consulting/FIX_13.0_dispatch_cloned_datepicker_not_working 
FIX: datepickers cloned using jquery are not working
 2021-08-01 23:51:57 +02:00
Laurent Destailleur
7ab129d489
Merge pull request #18179 from joseplluis/patch-8 
Add missing line product variables
 2021-08-01 23:47:56 +02:00
Christian Foellmann
b9cb04d4b7
Merge branch 'develop' into agenda-fcomm-cancel 2021-07-29 08:14:02 +02:00
Laurent Destailleur
9dc45ac6ec
Merge pull request #18251 from cfoellmann/improve-makeorder 
Improve makeorder
 2021-07-28 15:41:09 +02:00
Christian Foellmann
51cfeddaaf add cancel button to classifyreception form on supplier_orders 2021-07-27 16:51:14 +02:00
Christian Foellmann
cefbcf03f6 fix cancel on makeorder (supplier_order) 2021-07-27 16:18:06 +02:00
Christian Foellmann
8b118670c3 fix agenda item refuse 2021-07-27 15:11:13 +02:00
Christian Foellmann
faf50a5aaa add agenda auto creation on supplier_order cancellation 2021-07-27 15:06:28 +02:00
Josep Lluís
20f347cd4c
Add missing line product variables 
Add missing line product variables: product_tobatch and product_barcode
 2021-07-20 07:07:01 +02:00
atm-florian
8fdd9deb16 FIX: datepickers cloned using jquery are not working 2021-07-19 14:06:56 +02:00
Laurent Destailleur
0ccc2d9033 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-16 15:01:11 +02:00
Laurent Destailleur
af1c43c70d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/modules/modBarcode.class.php
	htdocs/fourn/class/fournisseur.commande.dispatch.class.php
 2021-07-16 14:05:42 +02:00
Florian Mortgat
180527d23a FIX 13.0: class CommandeFournisseurDispatch provides trigger for UPDATE but not for CREATE / DELETE 2021-07-16 10:10:57 +02:00
Laurent Destailleur
d91051488c
Merge pull request #18125 from fr69400/develop 
NEW add hookmanager on note pages
 2021-07-11 20:25:16 +02:00
stickler-ci
789cea9a85 Fixing style errors. 2021-07-11 07:49:05 +00:00
fr69400
ce4cab04d4
Update note.php 2021-07-11 09:48:33 +02:00
stickler-ci
48846888cc Fixing style errors. 2021-07-11 07:48:30 +00:00
fr69400
beaee09c98
Update note.php 2021-07-11 09:48:15 +02:00
stickler-ci
4272f93aa4 Fixing style errors. 2021-07-09 16:41:41 +00:00
fr69400
e45d5c1d0d NEW add hookmanager on note pages 2021-07-09 18:36:21 +02:00
Laurent Destailleur
af8c973050 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-09 13:35:08 +02:00
Laurent Destailleur
b7c42c70ef Fix date for planned entries 2021-07-09 13:33:37 +02:00
Laurent Destailleur
2bef8a27c8 Trans 2021-07-09 12:34:51 +02:00
Laurent Destailleur
5779a56ae0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-04 21:23:53 +02:00
Laurent Destailleur
7013f01a41 Fix look and feel v14 2021-07-04 21:14:46 +02:00
Laurent Destailleur
f6efe51032 Fix trouble with product id = -1 2021-07-04 21:02:02 +02:00
Laurent Destailleur
affe6d9631 Sync transifex 2021-07-03 19:00:58 +02:00
Laurent Destailleur
9b7c0a9246 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2021-07-03 18:32:31 +02:00
lmarcouiller
2a30c699ac Fix #18063 : search filter status lost "Back to list" 2021-07-02 16:05:28 +02:00
lmarcouiller
903adadcc4 Fix Error type ent in fourn/commande/list.php 2021-07-02 16:05:14 +02:00
Laurent Destailleur
02a5755876 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/nl_NL/main.lang
 2021-06-29 19:59:51 +02:00
Laurent Destailleur
7d8770305a
Merge pull request #17790 from aspangaro/14b11 
NEW Add field date from/to in supplier payment list
 2021-06-29 19:54:41 +02:00
Francis Appels
69affc5df5 Fix php 8 warnings 2021-06-28 16:25:16 +02:00
Laurent Destailleur
11a71d8d2f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
 2021-06-23 11:41:30 +02:00
Laurent Destailleur
034906a129 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
	htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
 2021-06-23 11:30:44 +02:00
Laurent Destailleur
9c657206b3
Update linkedobjectblock.tpl.php 2021-06-23 10:47:51 +02:00
Laurent Destailleur
a1e6236df0 Fix regression sql error 2021-06-15 02:15:45 +02:00
Laurent Destailleur
8b0c2d997c Clean code 2021-06-14 19:28:38 +02:00
stickler-ci
745ad8b403 Fixing style errors. 2021-06-14 15:10:24 +00:00
Gauthier PC portable 024
564a3b66c2 FIX : method exists 2021-06-14 17:08:16 +02:00
Gauthier PC portable 024
33553f3347 FIX : same thing on supplier orders 2021-06-14 17:01:59 +02:00
Laurent Destailleur
dd27d38d5e
Merge pull request #17869 from aspangaro/14b13 
NEW Add field date from/to in supplier invoice list
 2021-06-14 16:02:50 +02:00
Scrutinizer Auto-Fixer
55c9f37ffa Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-06-14 13:37:02 +00:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Frédéric FRANCE
4138353d7f
fix warnings 2021-06-12 09:11:12 +02:00
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
 2021-06-11 19:05:05 +02:00
Laurent Destailleur
ac965bf49a FIX #16551 2021-06-11 17:40:04 +02:00
Laurent Destailleur
77efbda148 Fix responsive 2021-06-10 20:04:21 +02:00
Laurent Destailleur
f3b6c8bf17
Merge pull request #17876 from AlexisLaurier/bugfix/supplierBankTransfertWrongCodeCheckMassAction 
bugfix/supplierBankTransfertWrongCodeCheckMassAction
 2021-06-10 16:44:32 +02:00
Alexis LAURIER
03cd88d145 bugfix/supplierBankTransfertWrongCodeCheckMassAction 2021-06-10 16:29:56 +02:00
stickler-ci
17bdd0b5bc Fixing style errors. 2021-06-10 04:03:51 +00:00
Alexandre SPANGARO
3d26ad4cf8 NEW Add field date from/to in supplier invoice list 2021-06-10 05:59:29 +02:00
Laurent Destailleur
9afe8e54a7 Fix 2021-06-10 00:41:15 +02:00
Laurent Destailleur
c00bef83a8 Fix php unit 2021-06-09 18:05:56 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
fa4786a3f6 Fix permission 2021-06-08 16:19:21 +02:00
Frédéric FRANCE
4e530c2486
Update card.php 2021-06-08 12:05:45 +02:00
Alexandre SPANGARO
7608ac2ded Merge remote-tracking branch 'upstream/develop' into 14b11 2021-06-05 07:20:31 +02:00
Alexandre SPANGARO
466bc26256 Fix with search_date_startxxx 2021-06-05 07:16:43 +02:00
Laurent Destailleur
703001c625
Merge pull request #17532 from ibuiv/ibuiv-status-suppliers-hooks 
New Hooks to rename Supplier Orders statuses
 2021-06-05 02:11:29 +02:00
Laurent Destailleur
f0118183c8 Clean code 2021-06-05 01:11:05 +02:00
Laurent Destailleur
6ae4a75ac2
Update fournisseur.commande.class.php 2021-06-05 01:04:09 +02:00
Francis Appels
01f5a5fb18 Fix update receipt eatby 2021-06-04 12:38:04 +02:00
Laurent Destailleur
8d5c419f92
Merge pull request #17744 from fappels/14_fix_trigger_delete_dispatch 
Fix dispatch receipt edit and delete
 2021-06-04 12:37:05 +02:00
Laurent Destailleur
82757f0989
Merge pull request #17775 from dolibit-ut/patch-337 
Update list.php
 2021-06-04 10:35:51 +02:00
Laurent Destailleur
3a201fa017
Merge pull request #17776 from dolibit-ut/patch-338 
Update card.php
 2021-06-04 10:35:28 +02:00
Laurent Destailleur
36eaad89aa
Merge pull request #17777 from dolibit-ut/patch-339 
Update card.php
 2021-06-04 10:35:11 +02:00
Laurent Destailleur
4c592401e6
Merge pull request #17781 from cfoellmann/refuse-note 
ADD note to supplier order refusal
 2021-06-04 10:10:17 +02:00
Laurent Destailleur
c7e21daee7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-04 09:36:20 +02:00
Laurent Destailleur
621aa9e6f3 Fix typo 2021-06-04 09:27:33 +02:00
Laurent Destailleur
3ae3137eaf Missing picto 2021-06-04 08:57:48 +02:00
Laurent Destailleur
350a421544
Update card.php 2021-06-04 08:41:26 +02:00
Frédéric FRANCE
ca66cdad01
debug intracomm report transport mode 2021-06-03 21:47:10 +02:00
Alexandre SPANGARO
c35124f036 NEW Add field date from/to in supplier payment list 2021-06-01 23:23:00 +02:00
Christian Foellmann
55d48077a3 ADD note to supplier order refusal 2021-05-31 10:45:34 +02:00
UT from dolibit
7aae5be54a
Update card.php 2021-05-31 10:36:43 +02:00
UT from dolibit
fed7878d18
Update card.php 
$lineid  was duplicate
 2021-05-31 10:33:36 +02:00
UT from dolibit
a97efdbdfa
Update list.php 
$title = $langs->trans('Supplier')." - ".$langs->trans('ProductsAndServices');
 2021-05-31 10:31:25 +02:00
Francis Appels
48f5cea917 Fix update receipt eatby 2021-05-27 16:03:17 +02:00
Francis Appels
8ed24d6796 Add missing trigger LINERECEPTION_DELETE 2021-05-27 16:02:12 +02:00
Frédéric FRANCE
1662d4a829
fix warnings 2021-05-25 23:14:36 +02:00
Laurent Destailleur
8f9de222c1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-25 21:53:56 +02:00
Laurent Destailleur
4b47611e23 Debug v14 2021-05-25 21:21:09 +02:00
Laurent Destailleur
714334c585
Merge pull request #17698 from OPEN-DSI/new-translate-order-supplier 
NEW translate supplier order menus and button
 2021-05-25 20:34:17 +02:00
Laurent Destailleur
a09db63c7b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/contrat/list.php
	htdocs/don/class/api_donations.class.php
	htdocs/societe/class/societe.class.php
 2021-05-25 20:17:54 +02:00
Laurent Destailleur
1b5f7b78b5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-25 20:12:34 +02:00
Laurent Destailleur
fb6aea72b8 Fix syntax error 2021-05-25 12:06:29 +02:00
lvessiller
38bd595ebd NEW translate supplier order menus and button 2021-05-21 14:18:46 +02:00
Laurent Destailleur
04e9f2c988 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/translation.php
 2021-05-20 15:00:39 +02:00
Laurent Destailleur
e6e6574cb8
Merge pull request #17667 from aspangaro/11p1 
FIX wrong variable fk_code_ventilation register for addline
 2021-05-20 14:31:52 +02:00
Laurent Destailleur
217ee260c2 css 2021-05-19 15:11:47 +02:00
lvessiller
e2e6d4ba14 FIX keep special code on supplier order lines for external modules 2021-05-19 14:29:46 +02:00
Alexandre SPANGARO
f86e10b453 FIX wrong variable fk_code_ventilation register for addline 2021-05-19 06:37:02 +02:00