Laurent Destailleur
4cac6b7e29
css
2022-04-07 14:03:14 +02:00
Laurent Destailleur
4693ef42bd
Enhance responsive
2022-04-07 11:18:56 +02:00
Laurent Destailleur
c7d5ecd4f7
Renamed hidden option INVOICE_CAN_ALWAYS_BE_EDITED into
...
INVOICE_CAN_BE_EDITED_EVEN_IF_PAYMENT_DONE for better understanding.
2022-04-05 17:39:56 +02:00
Laurent Destailleur
800080c06f
FIX Navigation between invoices
2022-03-30 18:42:17 +02:00
Laurent Destailleur
97a7450f10
NEW Auto set invoice paid when adding credit not and remain to pay is 0
2022-03-30 18:41:45 +02:00
Laurent Destailleur
8eeb6f3c8d
Merge pull request #20315 from atm-steve/FIX_Facture_dolGetButtonAction
...
Fix: Facture dolGetButtonAction
2022-03-29 21:11:24 +02:00
Laurent Destailleur
636188f28a
Merge pull request #20247 from thomas-Ngr/develop_new_check_invoice_date
...
NEW: check invoice date
2022-03-29 16:07:31 +02:00
Laurent Destailleur
63d9f69732
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2022-03-29 15:55:47 +02:00
Laurent Destailleur
1251e80963
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/accountancy/index.php
htdocs/commande/list.php
htdocs/langs/en_US/errors.lang
htdocs/projet/class/task.class.php
2022-03-29 15:10:11 +02:00
Laurent Destailleur
007004c2e0
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/accountancy/customer/lines.php
htdocs/accountancy/index.php
htdocs/accountancy/supplier/lines.php
htdocs/compta/facture/card.php
htdocs/core/tpl/extrafields_view.tpl.php
htdocs/langs/en_US/errors.lang
2022-03-29 15:02:29 +02:00
Marc de Lima Lucio
cbba7d7d5f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms
2022-03-25 16:14:53 +01:00
Thomas Negre
6dfad5d69f
facture/card.php: replace redirection by = ''
2022-03-24 11:09:39 +01:00
Laurent Destailleur
161e795759
Look and feel
2022-03-23 17:12:25 +01:00
Laurent Destailleur
02e2f9815d
NEW Add option INVOICEREC_SET_AUTOFILL_DATE_START/END
2022-03-22 11:47:25 +01:00
Laurent Destailleur
cf13eb7ac7
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-03-15 18:22:37 +01:00
Laurent Destailleur
961636ea35
CSS
2022-03-12 16:04:00 +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
steve
c3b22ed26e
wip: clean comments
2022-03-09 17:10:53 +01:00
steve
25fcb83b74
wip: reopen button
2022-03-09 16:41:26 +01:00
Thomas Negre
4ad92a04fc
stickler corrections
2022-03-09 09:25:52 +01:00
Thomas Negre
7c866ce6a2
facture/card.php: avoid validating invoices with date anterior to last invoice date
2022-03-09 09:25: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
lvessiller
397776d4a4
FIX check mandatory thirdparty fields for mass action
2022-03-08 11:29:01 +01:00
steve
665e401564
wip: replace butAction
2022-03-04 17:03:40 +01:00
Laurent Destailleur
0d024147bf
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-28 22:36:31 +01:00
Laurent Destailleur
dfba29b3c6
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/api/class/api.class.php
htdocs/compta/facture/card.php
htdocs/reception/list.php
2022-02-28 22:30:17 +01:00
Laurent Destailleur
c1268a3e39
Merge pull request #20151 from aspangaro/14p34
...
FIX Invoice - When you create an invoice and defined a thirdparty, fk_account is not retrieved from company card
2022-02-28 21:38:07 +01:00
Laurent Destailleur
c2fb5d577c
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/migration/14.0.0-15.0.0.sql
htdocs/langs/en_US/banks.lang
htdocs/projet/list.php
2022-02-28 20:12:28 +01:00
Laurent Destailleur
ca236c556a
FIX Blocking situation when a payment was deleted in bank.
...
FIX Missing or bad permissions
2022-02-28 19:45:53 +01:00
Regis Houssin
9cf5bccf43
FIX options should not exists on invoices
2022-02-28 18:13:29 +01:00
Alexandre SPANGARO
18a8eac1cd
Modify fix
2022-02-26 07:17:44 +01:00
Alexandre SPANGARO
0510d84263
FIX Invoice - When you create an invoice and defined a thirdparty, fk_account is not retrieved from company card
2022-02-23 06:08:20 +01:00
Laurent Destailleur
e96061dd18
Fix phpunit SecurityTest
2022-02-22 23:46:57 +01:00
Laurent Destailleur
aad292b41b
Merge pull request #20074 from altairisfr/fix_parentline_13.0
...
More generic management of parentline
2022-02-16 20:25:04 +01:00
Christophe Battarel
6c6c854eae
fix parent line on create with origin
2022-02-15 10:23:43 +01:00
Laurent Destailleur
21f0264683
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-10 13:02:48 +01:00
Laurent Destailleur
1d6a7ebe03
Fix pb with bulk payment feature
2022-02-10 13:01:47 +01:00
Laurent Destailleur
e813de1595
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-02 14:08:54 +01:00
Laurent Destailleur
815dd74de0
Fix missing information propagated to trigger
2022-02-02 14:07:31 +01:00
Laurent Destailleur
b55830d205
Fix missing information propagated to trigger
2022-02-02 14:03:09 +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
5d176c75db
Merge pull request #19780 from aspangaro/16a7
...
NEW Thirdparty - Add rules customer accountancy code is mandatory to validate invoice
2022-01-25 15:00:47 +01:00
Laurent Destailleur
0a996f44be
Merge pull request #19819 from OPEN-DSI/new-invoice-propagate-extrafields-on-credit-note
...
NEW pre-filled extra fields with slected credit note
2022-01-23 20:58:45 +01:00
Alexandre SPANGARO
573d45fec8
Merge remote-tracking branch 'upstream/develop' into 15a14
2022-01-21 10:47:27 +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
Alexandre SPANGARO
22e4ea63ea
Merge remote-tracking branch 'upstream/develop' into 15a14
2022-01-13 22:30:05 +01:00
Alexandre SPANGARO
6d1f5e1ef1
NEW Add possibility to create contract from invoice
2022-01-13 22:29:48 +01:00
lvessiller
2d9c46ed3a
NEW pre-filled extra fields with slected credit note
2022-01-12 12:22:43 +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
cde290c78a
Merge pull request #19402 from atm-gauthier/fix_reorder_lines_after_delete_line_everywhere
...
FIX : reorder all lines when delete document line everywhere (4 documents were missing)
2022-01-10 21:23:23 +01:00
Laurent Destailleur
1cc16f73d8
FIX #19761
2022-01-10 19:28:57 +01:00
Alexandre SPANGARO
960aaded8e
NEW Thirdparty - Add rules customer accountancy code is mandatory to validate invoice
2022-01-09 21:08:06 +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
00b43be7e6
Code comment
2021-12-23 10:20:01 +01:00
Laurent Destailleur
fee64f57d4
FIX Can't close a down payment if paid with credit notes.
2021-12-23 10:09:20 +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
f1af5a41bf
Fix several pb with down payments
2021-12-16 12:53:46 +01:00
Laurent Destailleur
43e682b56f
Fix several pb with down payments
2021-12-16 12:33:45 +01:00
Laurent Destailleur
f1dac82a53
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/adherents/card.php
htdocs/categories/edit.php
htdocs/contact/card.php
htdocs/core/class/extrafields.class.php
htdocs/product/stock/card.php
2021-12-08 17:56:05 +01:00
lmarcouiller
b732d80ca5
Fix php 8.0 warnings
2021-12-02 15:56:34 +01:00
Laurent Destailleur
10e126eb69
Clean code on pdf templates
2021-12-02 10:43:44 +01:00
Laurent Destailleur
bacf569e0b
Fix phpcs
2021-12-01 17:33:26 +01:00
Laurent Destailleur
259418d1dd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-12-01 12:10:14 +01:00
Laurent Destailleur
8bace4c64e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-11-30 16:24:42 +01:00
Laurent Destailleur
a298a845f1
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/core/actions_massactions.inc.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/memory.lib.php
htdocs/langs/en_US/holiday.lang
htdocs/ticket/card.php
2021-11-30 16:24:18 +01:00
Laurent Destailleur
3de3adad74
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/ajax/objectonoff.php
2021-11-30 16:11:12 +01:00
Laurent Destailleur
87a66c7bf0
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-11-30 15:57:14 +01:00
Laurent Destailleur
7937a798b7
Merge pull request #18331 from marc-dll/12.0_FIX_invoice_multicurrency_discount
...
FIX: multicurrency: fields in discount unitialized when creating deposit
2021-11-30 14:23:37 +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
e02405edc9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
2021-11-22 16:23:26 +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
Laurent Destailleur
441af6b6fb
Fix add rel="noopener noreferrer"
2021-11-22 02:35:55 +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
21c2dba922
Fix phpcs
2021-11-11 19:06:55 +01:00
Laurent Destailleur
cb65903537
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/langs/en_US/bills.lang
2021-11-08 03:09:30 +01:00
Laurent Destailleur
e8b3875e2e
FIX bad sign of amount stored for multicurrency columns on credit notes
2021-11-08 02:57:21 +01:00
Laurent Destailleur
2b6d296e63
Rename var
2021-11-05 13:58:11 +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
d891dd8ddc
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/stocks.lang
htdocs/product/stats/card.php
htdocs/projet/element.php
htdocs/salaries/card.php
2021-10-31 16:19:10 +01:00
Laurent Destailleur
da4fe03be7
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/class/html.formticket.class.php
htdocs/ticket/card.php
2021-10-31 14:37:33 +01:00
Laurent Destailleur
ca8dab36a3
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/class/html.formticket.class.php
htdocs/core/modules/modAdherent.class.php
htdocs/core/modules/modProjet.class.php
2021-10-31 14:33:44 +01:00
Laurent Destailleur
6d918ad1c7
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-10-31 14:24:19 +01:00
Laurent Destailleur
fe7e1d4118
Look and feel v15
2021-10-29 09:40:38 +02:00
Marc de Lima Lucio
03c24b2274
FIX: deposit payment terms: getDictvalue() renamed to getDictionaryValue()
2021-10-28 16:51:59 +02:00
Marc de Lima Lucio
668088a63f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms
2021-10-28 15:54:18 +02:00
Marc de Lima Lucio
eb8d7f92c3
FIX: invoice: inpossible to create an invoice because of very bad check + warnings when trying to print tabs for invoice with no ID
2021-10-28 15:26:40 +02:00
Laurent Destailleur
e9ba9fc103
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/list.php
htdocs/core/modules/mailings/modules_mailings.php
2021-10-26 13:52:00 +02:00
Laurent Destailleur
da2ce063b3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/contact/card.php
htdocs/contact/list.php
htdocs/core/modules/mailings/modules_mailings.php
htdocs/product/card.php
htdocs/public/emailing/mailing-unsubscribe.php
2021-10-26 13:42:30 +02:00
Laurent Destailleur
fde44f2792
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/contact/list.php
htdocs/core/modules/mailings/modules_mailings.php
2021-10-26 13:29:47 +02:00
Laurent Destailleur
181991ee47
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-10-26 13:10:23 +02:00
Laurent Destailleur
9cd59bf2c4
Merge pull request #18508 from henrynopo/patch-3
...
NEW Additional reason for Customer's partial payment - bank fees
2021-10-24 12:54:19 +02:00
Laurent Destailleur
8604f9b153
Clean DOM (remove ficheaddleft div)
2021-10-23 17:18:35 +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
0cb1972674
Update card.php
2021-10-15 15:07:48 +08:00
Marc de Lima Lucio
29768a1c6e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms
2021-10-13 11:33:04 +02:00
Laurent Destailleur
f3c16ba490
Merge pull request #18905 from indelog/fix_origin_invoice_custom
...
Fix creataing invoice originating for custom module object
2021-10-11 15:26:07 +02:00
Laurent Destailleur
b29bd325fe
Update card.php
2021-10-11 15:25:25 +02:00
atm-florian
57052e2fba
FIX PR#18931 Remove useless explicit call to dol_shutdown
2021-10-11 11:10:14 +02:00
atm-florian
2da16ade6c
FIX: consistent UX when calling a tab from the invoice card with empty ref / id
2021-10-08 17:24:52 +02:00
lvessiller
be4a00213c
FIX optional visibility on create card
2021-10-08 15:58:08 +02:00
stickler-ci
39cc2ca5b6
Fixing style errors.
2021-10-05 09:42:52 +00:00
Indelog
6c82b1d0e1
Fix creataing invoice originating for custom module
...
This fix the invoice create form when we provide `origin` element in
url. The actual create form overide the value for origin field with
`$objectsrc->element`. This make creation of invoice originating from a custom
module module impossible because we need the module part to instantiate
the class for the custom module object.
This also modify Common Object::fetch Object Linked() to append the
module part for `$sourcetype` and `$targettype` if it not set and object
have module property and it not in core module.
2021-10-05 11:35:43 +02:00
Marc de Lima Lucio
8cb6cdf1bc
NEW: deposit payment terms: prefill deposit parameters if coming from an origin with the corresponding payment conditions
2021-09-30 11:48:32 +02:00
Laurent Destailleur
37603b451a
Fix token in url
2021-09-27 12:24:01 +02:00
Laurent Destailleur
27c41946b7
Merge pull request #18182 from atm-jpb/NEW_field_in_service_object
...
NEW : field and behavior in product object
2021-09-23 12:14:09 +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
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
Christian Foellmann
fd1d4d9073
add missing css classes to buttons
2021-09-16 11:33:42 +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
4705d41ed2
FIX Relative discount with high nb of decimals
2021-09-08 22:00:16 +02:00
jpb
65a2486f94
merge conflict
2021-09-06 09:43:52 +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
3240a3652d
Update card.php
2021-08-30 15:34:59 +08: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
5cd609e14e
Merge pull request #18507 from henrynopo/patch-5
...
Customer Invoice - Multicurrency Remaining to Pay (updated)
2021-08-28 17:36:01 +02:00
henrynopo
11497d4bf0
Update card.php
2021-08-28 22:38:17 +08:00
Laurent Destailleur
2dd91bf312
Clean code
2021-08-27 23:36:06 +02:00
Laurent Destailleur
2f225ee7e5
Clean code by adding cast int.
2021-08-27 16:33:03 +02:00
henrynopo
a79abfd4e0
Update card.php
2021-08-26 10:37:03 +08:00
stickler-ci
bafe22ff77
Fixing style errors.
2021-08-26 02:29:45 +00:00
henrynopo
f6daad4480
Update card.php
2021-08-26 10:25:32 +08:00
Christian Foellmann
f094b4c70c
fix up most of the remaining submit inputs
2021-08-24 17:04:17 +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
15da97f1da
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/compta/facture/card.php
htdocs/product/price.php
2021-08-24 15:05:14 +02:00
Laurent Destailleur
591059847e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/product/price.php
2021-08-24 15:00:35 +02: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
b92fe38bc0
Fixing style errors.
2021-08-16 01:47:49 +00:00
henrynopo
9a65cbeab7
Customer Invoice - Multicurrency Remaining to Pay
...
Added the remainder to be paid in multicurrency mode.
2021-08-16 09:39:09 +08:00
Marc de Lima Lucio
08f21e3fc4
FIX: invoice validation: when checking if any vat rate has a negative amount, prevent false positives with -1E-14 amounts
2021-08-10 10:23:56 +02:00
jpb
f99ba2c1e1
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object
2021-08-04 17:26:23 +02:00
Marc de Lima Lucio
9d234a8541
FIX: multicurrency: fields in discount unitialized when creating deposit
2021-08-03 18:32:22 +02:00
Laurent Destailleur
eced1c824a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/core/class/html.form.class.php
htdocs/projet/tasks/time.php
2021-08-02 18:47:09 +02:00
Laurent Destailleur
d822421e10
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/accountancy/tpl/export_journal.tpl.php
htdocs/projet/tasks/time.php
2021-08-02 18:31:26 +02:00
Alexandre SPANGARO
262dd1600b
FIX: Invoice - Missing button to reopen an abandoned situation invoice
2021-07-29 06:23:12 +02:00
stickler-ci
2f0ba41a53
Fixing style errors.
2021-07-20 13:35:10 +00:00
jpb
1237c5ba55
add msg to formconfirm on propal invoice and commande
2021-07-20 14:46:56 +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
6ae1d192e4
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/card.php
2021-07-02 16:14:12 +02:00
Laurent Destailleur
01cf608ef4
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-07-02 16:06:48 +02:00
Laurent Destailleur
a7f850dafb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-07-02 16:05:51 +02:00
Laurent Destailleur
7c2121c439
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/tpl/objectline_edit.tpl.php
2021-06-30 15:06:16 +02:00
Laurent Destailleur
51456741d9
FIX Can't edit replacement invoice
...
FIX Status of invoice when making a replacement invoice
2021-06-30 12:43:44 +02:00
atm-arnaud
8772c53723
FIX deposit can create credit note in payment conf
2021-06-30 12:37:21 +02:00
Laurent Destailleur
56787bc292
Update card.php
2021-06-29 19:14:03 +02:00
Francis Appels
1b7b45d72a
Merge remote-tracking branch 'Dolibarr/14.0' into 14_fix_php8_part2
2021-06-29 16:56:48 +02:00
Francis Appels
e4f61d430f
Invoice php 8 issue and warnings.
...
Seems if ("" < 0) is true in php 8
2021-06-29 16:33:24 +02:00
lmarcouiller
923a015aac
Fix #18014 : update of compta/facture/card.php
2021-06-28 11:38:34 +02:00
Laurent Destailleur
67e7556f70
Merge pull request #18032 from OPEN-DSI/new-invoice-create-from-clone-errors
...
NEW get errors on create invoice from clone
2021-06-26 11:53:45 +02:00
Laurent Destailleur
6e3647af2c
Debug v14
2021-06-26 00:08:19 +02:00
lvessiller
24acc82ca6
NEW get errors on create invoice from clone
2021-06-25 16:40:39 +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
Frédéric FRANCE
0ea0966b09
Update card.php
2021-06-08 12:01:05 +02:00
Frédéric FRANCE
b1c3a7cf48
avoid fatal error
2021-06-08 10:38:34 +02:00
Laurent Destailleur
8b5922a0df
Update card.php
2021-06-04 12:57:43 +02:00
Laurent Destailleur
43be7cf996
Update card.php
2021-06-04 12:56:40 +02:00
Laurent Destailleur
292d5f6a15
Update card.php
2021-06-04 12:55:03 +02:00
stickler-ci
dfb2e54750
Fixing style errors.
2021-05-27 14:25:42 +00:00
Frans Bosman
fd2d10d443
Update card.php
2021-05-27 16:23:33 +02:00
stickler-ci
c31530e7ed
Fixing style errors.
2021-05-27 10:24:18 +00:00
Frans Bosman
61753791b4
Update card.php
...
Add Batchinfo on invoice detail lines if hidden feature INCUDE_BATCHINFO_ON_INVOICE is set
2021-05-27 12:20:42 +02:00
Laurent Destailleur
dbd7292cd6
Replace doubleval into floatval
2021-05-20 09:22:55 +02:00
Laurent Destailleur
217ee260c2
css
2021-05-19 15:11:47 +02:00
Laurent Destailleur
cf0da5cee7
css
2021-05-19 15:00:44 +02:00
stickler-ci
05ea8761a1
Fixing style errors.
2021-05-13 08:28:14 +00:00
ptibogxiv
b9336570ff
NEW report contact/adresses on credit note from invoice
...
keep same contact/adresses from source invoice (ir: usefull for correct notifications)
2021-05-13 10:26:09 +02:00
Laurent Destailleur
b5a43c8d1d
FIX #17502
2021-05-11 21:31:43 +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
fr69400
96baa1ef49
wrong variable name
2021-04-29 17:36:45 +02:00
fr69400
d9e25c61bb
formAddObjectLine cant be overloaded by hook
2021-04-29 15:32:15 +02:00
Laurent Destailleur
efbed70286
Update card.php
2021-04-27 01:17:26 +02:00
stickler-ci
6387b929cc
Fixing style errors.
2021-04-26 12:30:44 +00:00
Robin-Yann
9fc0416664
Update card.php
2021-04-26 14:28:43 +02:00
Robin-Yann
c1f3626cd7
Update card.php
2021-04-26 14:11:24 +02:00
Robin-Yann
676067eafc
Update card.php
2021-04-26 10:21:25 +02:00
stickler-ci
ebd3b00016
Fixing style errors.
2021-04-26 07:24:00 +00:00
Robin-Yann
836b811449
Merge branch 'develop' into 13-fix-combo-prospect
2021-04-26 09:21:32 +02:00
Laurent Destailleur
fd2d317b4a
Fix #yogosha5881
2021-04-25 15:55:36 +02:00
Laurent Destailleur
6c2d9d3b3c
Fix permission to reopen invoice.
2021-04-25 13:17:47 +02:00
Laurent Destailleur
48c26fd614
Fix add option INVOICE_DISALLOW_REOPEN to lock problematic feature
2021-04-24 18:43:24 +02:00
Laurent Destailleur
db5dcd3e52
NEW When a doc file is shared, link is visible from main page of doc.
2021-04-15 17:56:55 +02:00
Laurent Destailleur
f1d55d38ba
Show link to shared file if it exists.
2021-04-15 17:09:15 +02:00
Laurent Destailleur
fcc6431896
Merge pull request #17136 from aspangaro/14a35
...
NEW: Add deposit on supplier invoice (& somes ajustments)
2021-04-07 02:51:32 +02:00
Laurent Destailleur
e23ddb383e
css
2021-04-06 23:38:52 +02:00
Laurent Destailleur
7c27ab6121
Fix css
2021-04-06 23:35:30 +02:00
Alexandre SPANGARO
82b652df8a
NEW: Add deposit on supplier invoice (& somes ajustments)
2021-04-06 09:15:34 +02:00
Laurent Destailleur
3744bc6a7a
FIX #yogosha5746 - next step (work in progress)
2021-03-30 18:17:13 +02:00