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
4de50da0dd
Repare code to forbidden var_dump() into code
2022-05-17 14:55:38 +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
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
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
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
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
2b65ba4a45
FIX insert free price using price without tax on order
2022-02-10 15:03:41 +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
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
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
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
43e682b56f
Fix several pb with down payments
2021-12-16 12:33:45 +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
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
Laurent Destailleur
5613ec71d6
Fix syntax
2021-11-07 17:48:01 +01:00
Laurent Destailleur
2b6d296e63
Rename var
2021-11-05 13:58:11 +01:00
Laurent Destailleur
d32ecfe5aa
Merge pull request #19291 from OPEN-DSI/fix_00019
...
NEW: Can show Paid button if invoice or supplier invoice has no payments with global
2021-11-05 13:37:39 +01:00
Laurent Destailleur
bc7b035846
Update card.php
2021-11-05 13:11:54 +01:00
Laurent Destailleur
02200b9810
Update card.php
2021-11-05 13:10:44 +01:00
Vincent Dieltiens
a359c7a681
Handle case where credit note has no source invoice
2021-11-03 14:22:08 +01:00
kamel
d91c24233c
NEW: Can show Paid button if invoice or supplier invoice has no payments with global INVOICE_CAN_FORCE_PAID_WHEN_NO_PAIEMENTS and SUPPLIER_INVOICE_CAN_FORCE_PAID_WHEN_NO_PAIEMENTS
2021-11-02 16:43:09 +01:00
Laurent Destailleur
fe7e1d4118
Look and feel v15
2021-10-29 09:40:38 +02:00
Laurent Destailleur
f2cd7a7a56
Removed the div class="ficheaddleft"
2021-10-24 00:37:37 +02:00
Laurent Destailleur
e43b33028c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
2021-10-20 15:06:10 +02:00
Laurent Destailleur
f8010dfcbc
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/reception/list.php
htdocs/takepos/pay.php
2021-10-16 13:01:03 +02:00
stickler-ci
fb79aaeb0c
Fixing style errors.
2021-10-15 07:19:49 +00:00
Henry
316bc16634
Update card.php
2021-10-15 15:05:13 +08:00
lvessiller
be4a00213c
FIX optional visibility on create card
2021-10-08 15:58:08 +02:00
Laurent Destailleur
68ac62d09c
Fix phpcs
2021-10-07 11:05:06 +02:00
Laurent Destailleur
2cb0edb5eb
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/project/suggestbooth.php
htdocs/public/project/suggestconference.php
2021-10-07 11:01:53 +02:00
Laurent Destailleur
9b5909300e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/paiement/card.php
htdocs/fourn/facture/card.php
2021-10-07 11:00:00 +02:00
Laurent Destailleur
e3032ef1c4
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/fourn/facture/card.php
2021-10-06 16:06:25 +02:00
Laurent Destailleur
10f0434116
Update card.php
2021-10-06 15:30:19 +02:00
Florian HENRY
6d00097c89
fix
2021-09-30 16:37:52 +02:00
Florian HENRY
d0508d557b
fix: checkbox for line selection between supplier order and supplier invoice was infective
2021-09-30 14:56:02 +02:00
Laurent Destailleur
37603b451a
Fix token in url
2021-09-27 12:24:01 +02:00
Laurent Destailleur
d38c3028eb
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/class/expensereport.class.php
2021-09-23 02:41:53 +02:00
Laurent Destailleur
51b6318f88
FIX Test when date of invoie is in future (pb with TZ and offset)
2021-09-23 02:14:01 +02:00
Laurent Destailleur
1e0a7e4342
FIX Test when date of invoie is in future (pb with TZ and offset)
2021-09-23 02:10:39 +02:00
lvessiller
991a7ffd43
FIX selected lines on supplier invoice create
2021-09-21 11:04:59 +02:00
Laurent Destailleur
d760686239
Fix case of newtoken()
2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a
Fix add action delete* as sensitive action
2021-09-18 22:04:41 +02:00
Laurent Destailleur
8bdc53f469
Fix Add action classify as sensitive actions
2021-09-18 20:49:24 +02:00
Laurent Destailleur
62b721a904
Add deletecontact as sentitive action
...
Replace dol_buildpath with DOL_URL_ROOT
2021-09-18 19:34:46 +02:00
Laurent Destailleur
034c5651c8
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/eventorganization/class/conferenceorbooth.class.php
htdocs/langs/en_US/eventorganization.lang
htdocs/public/eventorganization/attendee_subscription.php
2021-09-08 22:13:35 +02:00
Laurent Destailleur
30856d5b18
FIX Relative discount with high nb of decimals
2021-09-08 22:09:02 +02:00
Laurent Destailleur
c4621f0433
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2021-09-03 18:04:14 +02:00
Laurent Destailleur
2e3b6b2fc8
Backport sql injection fix from develop
2021-09-03 18:00:28 +02:00
Laurent Destailleur
77e9f15360
Work on #18448
2021-09-02 22:52:17 +02:00
Laurent Destailleur
8600d8d00d
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-01 22:50:06 +02:00
henrynopo
7bf6daaca7
Update card.php
2021-08-30 15:33:26 +08: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
Laurent Destailleur
2dd91bf312
Clean code
2021-08-27 23:36:06 +02:00
Laurent Destailleur
3b6559b1a6
Clean code by adding cast int.
2021-08-27 18:53:45 +02:00
Christian Foellmann
9752501ef6
change links for thirdparty to target the type customer|supplier tab
2021-08-27 15:32:53 +02:00
henrynopo
054b466e0a
Update card.php
2021-08-26 09:40:44 +08: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
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
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
Laurent Destailleur
b7c42c70ef
Fix date for planned entries
2021-07-09 13:33:37 +02:00
Laurent Destailleur
7013f01a41
Fix look and feel v14
2021-07-04 21:14:46 +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
77efbda148
Fix responsive
2021-06-10 20:04:21 +02:00
Frédéric FRANCE
4e530c2486
Update card.php
2021-06-08 12:05:45 +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
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
UT from dolibit
7aae5be54a
Update card.php
2021-05-31 10:36:43 +02:00
Laurent Destailleur
217ee260c2
css
2021-05-19 15:11:47 +02:00
Laurent Destailleur
1c477d2131
Update card.php
2021-05-11 19:21:38 +02:00
Frédéric FRANCE
1d38dc11c6
uniformize supplier cards
2021-05-07 21:28:35 +02:00
Laurent Destailleur
e5b49ce0a2
Merge pull request #17448 from LuferGonn/fourn_facture_change_001
...
Update fourn/facture/card.php: Change position(ExtraFields)
2021-05-03 14:12:07 +02:00
Laurent Destailleur
d1f11d2e65
Merge pull request #17429 from fr69400/develop
...
FIX formAddObjectLine cant be overloaded by hook
2021-05-03 13:16:45 +02:00
Luis Fernando
6fb256822b
Update card.php: Change position(ExtraFields)
2021-04-30 21:07:24 -05:00
stickler-ci
8fda2ba2b4
Fixing style errors.
2021-04-29 13:34:43 +00:00
fr69400
d9e25c61bb
formAddObjectLine cant be overloaded by hook
2021-04-29 15:32:15 +02:00
kamel
4b490d434c
Corrections
2021-04-27 18:08:05 +02:00
kamel
80be0c32e4
Corrections
2021-04-27 14:13:59 +02:00
kamel
c645241327
Corrections
2021-04-27 12:11:28 +02:00
kamel
9c46b234cf
FIX Supplier invoices (deposit, multicurency in lines)
2021-04-26 17:43:27 +02:00
Laurent Destailleur
fd2d317b4a
Fix #yogosha5881
2021-04-25 15:55:36 +02:00
Alexandre SPANGARO
87cc1b2601
Add right supplier_invoice
2021-04-12 07:37:34 +02:00
Laurent Destailleur
6dc10bc87d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-04-07 12:19:39 +02:00
stickler-ci
30d26c1e28
Fixing style errors.
2021-04-06 07:20:07 +00:00
Alexandre SPANGARO
82b652df8a
NEW: Add deposit on supplier invoice (& somes ajustments)
2021-04-06 09:15:34 +02:00
Laurent Destailleur
ce1f8289a4
FIX #yogosha5746
2021-03-29 15:07:23 +02:00
Laurent Destailleur
d9108362ba
War against $_POST
2021-03-25 16:59:47 +01:00
Alexandre SPANGARO
f8703a0691
Translation "Generated documents"
2021-03-16 04:04:33 +01:00
Laurent Destailleur
f11a85a3e3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
htdocs/compta/facture/card.php
htdocs/contrat/card.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
2021-03-03 11:37:34 +01:00
Laurent Destailleur
7eb3e324c7
FIX #16503
2021-03-02 23:09:55 +01:00
Laurent Destailleur
42329b10c9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
build/generate_filelist_xml.php
htdocs/comm/propal/card.php
htdocs/commande/card.php
htdocs/compta/facture/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/modulebuilder.lib.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
htdocs/ticket/list.php
2021-03-02 15:27:20 +01:00
Laurent Destailleur
cffea1889f
FIX #16325
2021-03-02 01:17:28 +01:00
Frédéric FRANCE
8a782e1d4a
fix missing include
...
needed by dol_get_last_hour
2021-02-27 09:18:03 +01:00
Frédéric FRANCE
ed6d2376f1
code syntax fourn directory
2021-02-25 23:21:30 +01:00
Laurent Destailleur
bfe71e8509
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-17 14:28:19 +01:00
Laurent Destailleur
96a213ced7
Fix escaping html
2021-02-17 11:54:34 +01:00
Frédéric FRANCE
0da942210f
deprecate non camelCaps functions
2021-02-09 09:55:48 +01:00
Laurent Destailleur
f301635681
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
2021-02-03 21:02:32 +01:00
Laurent Destailleur
3b8b0d59ba
Merge pull request #16142 from OPEN-DSI/fix_erreur_facture_fourn
...
FIX: Select transport mode function when create a supplier invoice and add unique key to the table llx_c_transport_mode in migrate sql
2021-02-03 20:24:44 +01:00
Laurent Destailleur
348fd0fcb5
FIX #16160
2021-02-03 19:36:10 +01:00
kamel
506ba822e9
FIX: Select transport mode function when create a supplier invoice and add unique key to the table llx_c_transport_mode in migrate sql
2021-02-02 11:06:01 +01:00
Laurent Destailleur
b349290cd1
Fix test for date in future
2021-01-31 12:57:54 +01:00
Laurent Destailleur
7887d4cc8e
Fix price2num on all GETPOST('remise_percent')
2021-01-31 12:48:40 +01:00
Laurent Destailleur
2f69a380be
Fix syntax error
2021-01-16 16:06:49 +01:00
Laurent Destailleur
c7c74e8ed1
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/facture/card.php
2021-01-15 19:53:46 +01:00
Laurent Destailleur
7d37183f21
FIX Pb with VAT code when VAT code contains a number
2021-01-15 19:43:02 +01:00
Laurent Destailleur
828f1c8314
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
2021-01-15 14:04:22 +01:00