Commit Graph

2388 Commits

Author SHA1 Message Date
Alexandre SPANGARO
1edaa58d88 Use isModEnabled 2022-09-25 22:53:21 +02:00
Laurent Destailleur
2a98ff313e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-25 17:12:25 +02:00
Laurent Destailleur
f5e5de1eba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-09-25 17:12:03 +02:00
Laurent Destailleur
86091c3fde Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-25 17:01:44 +02:00
Alexandre SPANGARO
6c848333e6 Use isModEnabled 2022-09-25 15:30:40 +02:00
Laurent Destailleur
118b975f91 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-25 11:56:05 +02:00
Alexandre SPANGARO
f9b1f89413 Use isModEnabled 2022-09-25 06:31:12 +02:00
Alexandre SPANGARO
b1f425b703 Use isModEnabled 2022-09-25 06:23:16 +02:00
Alexandre SPANGARO
49f1afccca Use isModEnabled 2022-09-25 06:09:29 +02:00
Alexandre SPANGARO
01dfbac1a1 Use isModEnabled 2022-09-25 06:04:56 +02:00
priojk
a0a66dfa6f Apply fix also to supplier invoices 2022-09-24 17:36:43 +02:00
Philippe GRAND
6d7a1c4f30 update code toward php8 compliance 2022-09-24 14:50:47 +02:00
Laurent Destailleur
e1b5e5033f Clean code of deprecated field 2022-09-23 09:35:17 +02:00
Laurent Destailleur
0f9dd0b04a Fix missing test on multicurrency to show remain to pay vendor invoice 2022-09-22 14:53:34 +02:00
Laurent Destailleur
a71be1a121 Fix missing test on multicurrency to show remain to pay vendor invoice 2022-09-22 14:47:32 +02:00
Laurent Destailleur
0ca46076eb Fix field position 2022-09-21 14:21:29 +02:00
Laurent Destailleur
91bdaae898 Look and feel v17 2022-09-15 03:08:33 +02:00
Laurent Destailleur
cf887dba16
Merge pull request #22075 from grandoc/new_branch_04_09_2022
update code
2022-09-09 18:03:43 +02:00
Frédéric France
da8617e3ff Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-08 18:59:23 +02:00
Laurent Destailleur
ee05abaa27 Clean code 2022-09-08 15:13:16 +02:00
Laurent Destailleur
aa9036a0f5 Clean code 2022-09-08 15:05:51 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
lvessiller
6e6a62d167 NEW set payment default values when supplier order created from reception 2022-09-07 14:58:07 +02:00
Laurent Destailleur
9a2ef34af5
Merge pull request #22049 from aspangaro/17p4
NEW Manage VAT on all lines on purchases cycle
2022-09-07 14:07:31 +02:00
Laurent Destailleur
6b7e11dbdd Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-07 13:59:12 +02:00
Laurent Destailleur
967e203319 Fix fetch missing fields 2022-09-07 13:55:02 +02:00
Laurent Destailleur
afd0df015e
Merge pull request #22084 from defrance/patch-241
PHP V8 warning
2022-09-07 13:48:25 +02:00
This Charlène
7a3b94a1e9
Update list.php 2022-09-07 09:53:43 +02:00
This Charlène
3144362c6c
php V8 warning 2022-09-07 09:38:20 +02:00
This Charlène
e1a1ce5551
php V8 warning 2022-09-05 17:31:30 +02:00
This Charlène
4262d666ca
PHP V8 warning
and $objectidnext = $object->getIdReplacingInvoice(); not present
2022-09-05 16:15:13 +02:00
Alexandre SPANGARO
61419fac68 Add permissions 2022-09-04 21:58:21 +02:00
Philippe GRAND
94a646103d update code 2022-09-04 13:32:12 +02:00
Laurent Destailleur
760c6e581e
Merge pull request #22060 from grandoc/new_branch_03_09_2022
Update code
2022-09-03 11:44:36 +02:00
Philippe GRAND
62529b10e4 Update code 2022-09-03 11:28:48 +02:00
stickler-ci
3883e66004 Fixing style errors. 2022-09-02 14:25:03 +00:00
Alexandre SPANGARO
38352d0c28 NEW Manage VAT on all lines on purchases cycle 2022-09-02 16:22:54 +02:00
Frédéric FRANCE
9150f5102e Merge remote-tracking branch 'upstream/develop' into pr/grandoc/22009 2022-09-02 11:44:45 +02:00
Philippe GRAND
7688a2429d update code 2022-08-31 22:37:55 +02:00
Philippe GRAND
ab71f47924 update code 2022-08-31 22:37:31 +02:00
Philippe GRAND
e283e867d8 update code 2022-08-31 22:37:04 +02:00
Philippe GRAND
218d5a774e update code 2022-08-31 22:36:39 +02:00
Philippe GRAND
a36491f4db update code 2022-08-31 22:36:15 +02:00
Philippe GRAND
29c7ebad27 update code 2022-08-31 22:35:45 +02:00
Philippe GRAND
b6b6ff4b6f update code 2022-08-31 22:35:08 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Frédéric France
e71692e745 fix php8 warnings 2022-08-31 22:02:31 +02:00
Frédéric France
ece2f5553a fix php8 warnings 2022-08-31 21:49:10 +02:00
Laurent Destailleur
e0b1ad308b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-08-30 19:38:35 +02:00
Frédéric France
e78f9a56be use isModEnabled 2022-08-23 20:16:28 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
2b5205b639 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-22 13:05:22 +02:00
Laurent Destailleur
558ae00f66 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/core/ajax/onlineSign.php
2022-08-21 23:48:44 +02:00
ksar
1d1228286c
FIX #21772 2022-08-17 09:45:27 +02:00
Laurent Destailleur
6a61c495b3 # WARNING: head commit changed in the meantime
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-08-14 19:22:58 +02:00
Laurent Destailleur
35822d9431 css 2022-08-13 15:08:36 +02:00
Laurent Destailleur
a60a8d5057 sql error 2022-08-04 00:10:18 +02:00
Laurent Destailleur
528d54ba79 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-02 20:28:07 +02:00
Laurent Destailleur
4c4dd53385 Fix filter on company 2022-07-31 22:46:53 +02:00
Laurent Destailleur
25e034721c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-11 00:06:57 +02:00
Laurent Destailleur
24dc936000 Revert "default to create on card.php if $action is empty"
This reverts commit e0b664066b.
2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +02:00
Christian Foellmann
aaca9bc03d default to create on card.php if $action is empty 2022-07-08 09:16:02 +02:00
Laurent Destailleur
b7a99463a6
Merge pull request #21341 from fboitel/NEW#21000
NEW #21000
2022-07-07 22:06:59 +02:00
Christian Foellmann
4c5e05e411 fix page titles
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/contact/list.php
	htdocs/product/stock/movement_list.php
	htdocs/user/list.php
2022-07-06 19:19:08 +02:00
Laurent Destailleur
76e3c10c06
Revert "fix page titles" 2022-07-06 15:56:04 +02:00
Christian Foellmann
89d1389e2d fix page titles 2022-06-27 12:48:04 +02:00
Faustin
df8580dd4c NEW 21000 Added columns 'alias_name' on supplier invoice list 2022-06-21 19:50:05 +02:00
Alexandre SPANGARO
a8e4aec5c2 Same modification on supplier invoice 2022-06-15 04:46:58 +02:00
atm-florian
b4e068dcdc PR feedback: allow setting a specific hourtime 2022-06-14 18:13:32 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
atm-florian
9ae40a2a02 NEW: helper functions for dates + small demo case 2022-06-14 12:52:14 +02:00
Laurent Destailleur
bc11cf62f8 FIX #hunterdev2acfc8fe-247c-4f88-aeaa-042b6b8690a0 2022-06-13 10:44:20 +02:00
Laurent Destailleur
603201206a css 2022-06-02 12:35:38 +02:00
Laurent Destailleur
bc79f041dc Debug v16 2022-06-02 11:11:28 +02:00
Laurent Destailleur
8bacb6c755 Fix name of var 2022-05-22 17:09:08 +02:00
Laurent Destailleur
3205d88cad
Merge pull request #20962 from Hystepik/develop#7
Fix : facture fourn type not init in radio
2022-05-21 20:07:42 +02:00
Lucas Marcouiller
9c9acf1538 Fix : facture fourn type not init in radio 2022-05-21 19:15:15 +02:00
Lucas Marcouiller
b4a7657fbe fix style 2022-05-21 18:47:01 +02:00
Lucas Marcouiller
51041bbea1 Fix : php 8.0 warnings 2022-05-21 18:46:41 +02:00
Laurent Destailleur
86d34af4b0 Fix deprecated code 2022-05-18 11:38:56 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
Laurent Destailleur
b3b6337c4c
Merge branch 'develop' into NEW_deposit_payment_terms 2022-05-08 23:09:06 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
Laurent Destailleur
fa7254be9a Fix picto and perm 2022-05-03 17:05:14 +02:00
Laurent Destailleur
c96e3bdddf PHP v8 compatibility 2022-04-30 19:50:20 +02:00
Laurent Destailleur
fa8ce6e4fd
Merge pull request #20710 from fappels/develop_confirm_createbills
Move massaction 'confirm_createbills' from actions_massactions.inc.php to commande/list.php
2022-04-29 17:19:18 +02:00
Laurent Destailleur
40d0c3b996 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/tva/card.php
	htdocs/langs/en_US/admin.lang
2022-04-28 19:23:13 +02:00
stickler-ci
7f1d5fa867 Fixing style errors. 2022-04-25 12:43:58 +00:00
Francis Appels
7e44227df2 Cleanup 'confirm_createbills' 2022-04-25 14:28:57 +02:00
Laurent Destailleur
307476786c Fix label of remain to pay on vendor invoices
FIX tool to fix bank account not in main currency for vendor invoice
2022-04-19 23:24:08 +02:00
Laurent Destailleur
cb15a21e41 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/originproductline.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/user/card.php
2022-04-11 21:22:27 +02:00
Laurent Destailleur
da0fcb556f Fix css 2022-04-09 15:28:01 +02:00
Laurent Destailleur
d6860ca41b FIX bad bank amount in accounting with multicurrency 2022-04-09 02:22:45 +02:00
Gauthier PC portable 024
83e8e07416 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-04-08 09:25:08 +02:00
Laurent Destailleur
623f15711d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-04-07 19:26:07 +02:00
Laurent Destailleur
6ea8bd23ad
Merge pull request #20542 from ATM-Consulting/FIX_16.0_template_supplier_invoices_overlapping_conditions
FIX 16.0 - supplier invoice card creates two invoices instead of one
2022-04-07 18:26:40 +02:00
Laurent Destailleur
4693ef42bd Enhance responsive 2022-04-07 11:18:56 +02:00
atm-florian
046089f371 FIX 16.0 - ref_client set instead of ref_supplier (maybe copy-paste error) 2022-04-05 15:38:54 +02:00
atm-florian
392ba6deed FIX 16.0 - my previous fix was incomplete (missing parentheses around OR-separated conditions)
+ replace GETPOST('fac_rec', 'int') with variable
+ make sure it works even if, one day, the "nothing selected" value for the template supplier invoice selector changes to -1 instead of ''
2022-04-05 12:16:06 +02:00
atm-florian
b929c2f671 FIX 16.0 - supplier invoice card creates two invoices instead of one when creating from a template 2022-04-05 11:46:06 +02:00
Laurent Destailleur
d75483552d Responsive 2022-03-26 15:48:36 +01:00
Laurent Destailleur
bc938d86ba NEW Can enter price with tax for predefined products on purchase objects 2022-03-26 11:22:54 +01:00
Laurent Destailleur
e8a9a7b732 Responsive 2022-03-26 10:02:20 +01:00
Gauthier PC portable 024
5b715978e4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-03-10 10:02:57 +01:00
Marc de Lima Lucio
4efcbe8799 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:23:52 +01:00
Marc de Lima Lucio
1993a8d7b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:07:37 +01:00
John Livingston
1ece554c92
Fix: typo in template name
There was a typo in generated HTML comment.
2022-03-01 17:39:38 +01:00
kevin
22fc4317be Add init hooks on several supplier tabs 2022-02-25 09:37:36 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Laurent Destailleur
16e4e736fd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-10 16:28:29 +01:00
Laurent Destailleur
9e17fe8f4e Fix bad cancelation 2022-02-10 15:16:59 +01:00
Laurent Destailleur
2b65ba4a45 FIX insert free price using price without tax on order 2022-02-10 15:03:41 +01:00
Laurent Destailleur
954938cd75 Fix buttons 2022-02-10 12:33:28 +01:00
Laurent Destailleur
f787512592 Fix buttons 2022-02-10 12:30:29 +01:00
Laurent Destailleur
d69f9eca40 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/pdf.lib.php
2022-02-10 11:25:15 +01:00
Laurent Destailleur
a295725368 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-10 11:23:45 +01:00
atm-greg
4c6fd42e3a fix with eldy recommendations 2022-02-09 09:47:48 +01:00
Adrien Raze
ee52cac3ba NEW : Template supplier invoices 2022-02-07 14:34:27 +01:00
atm-greg
6035a374b7 fix bad array index 2022-02-02 14:44:38 +01:00
Laurent Destailleur
f9cb209262 Fix max nb of lines in supplier index page 2022-01-31 12:18:04 +01:00
Gauthier PC portable 024
3abe391f65 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-28 15:08:02 +01:00
UT from dolibit
56ef9d3d51
add CANCEL Button
add CANCEL Button
& add more space for small Touchscreens
2022-01-14 18:44:49 +01:00
Laurent Destailleur
91b2d59458 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-14 10:37:41 +01:00
Laurent Destailleur
53e65095a7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/commande/card.php
	htdocs/expedition/card.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
2022-01-14 10:36:46 +01:00
Laurent Destailleur
9dde80dd52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/expedition/card.php
	htdocs/fourn/commande/list.php
2022-01-14 10:30:39 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Gauthier PC portable 024
6799d48944 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-11 09:59:25 +01:00
Laurent Destailleur
12044fa67a Debug v15 2022-01-10 03:24:01 +01:00
Laurent Destailleur
05529817f4 css 2022-01-10 00:54:51 +01:00
Laurent Destailleur
fcfb6a55f4 Fix error management 2022-01-09 13:50:10 +01:00
Laurent Destailleur
6cecc3c2aa Fix clean data after update 2022-01-07 10:25:58 +01:00
Laurent Destailleur
cecb11bb1c Debug v15 2022-01-03 12:28:42 +01:00
Laurent Destailleur
809c8f993b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
	htdocs/filefunc.inc.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
2021-12-30 19:03:46 +01:00
Laurent Destailleur
fbce09f21b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/compta/facture/card.php
	htdocs/reception/card.php
2021-12-19 00:36:22 +01:00
Laurent Destailleur
39b4586957
Merge pull request #19624 from 1ocate/FIX_05_author_searching_include_first_and_last_name
Fix author searching include first and last name
2021-12-16 17:09:44 +01:00
Laurent Destailleur
9465edd8ec Add warning making payment if pending direct debit or credit trans 2021-12-16 14:09:56 +01:00
Laurent Destailleur
43e682b56f Fix several pb with down payments 2021-12-16 12:33:45 +01:00
Jay Yeo
41e4e70c6e Fix author searching include first and last name 2021-12-16 16:28:45 +07:00
Jay Yeo
7c1879a11a Fix author searching include first and last name 2021-12-15 16:52:57 +07:00
Laurent Destailleur
d80f83caf4 Clean code 2021-12-09 17:19:31 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
2021-11-29 15:09:18 +01:00
Laurent Destailleur
7cc9398661 css 2021-11-27 01:24:32 +01:00
Laurent Destailleur
654e20e9fb CSS 2021-11-27 01:11:59 +01:00
Gauthier PC portable 024
9840c1e0fa Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-22 16:17:55 +01:00
Gauthier PC portable 024
e75b6ae0b4 FIX : it's better with an input number 2021-11-22 16:13:46 +01:00
Gauthier PC portable 024
23249751d5 FIX : reorder all lines when delete document line everywhere 2021-11-17 12:10:12 +01:00
Gauthier PC portable 024
375dcf7028 FIX : dev name 2021-11-16 16:42:48 +01:00
Gauthier PC portable 024
9d41c1390d Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-16 14:20:24 +01:00
Gauthier PC portable 024
1e0d7d92a9 NEW : addline with position choice when MAIN_VIEW_LINE_NUMBER is enabled 2021-11-16 14:09:18 +01:00