ATM john
75d7c439dd
Merge branch '14.0_fix_regression_selct_extrafield_search' of github.com:atm-john/dolibarr into new_fix_regression_select_extrafield_search
2022-03-30 11:09:29 +02:00
Ferran Marcet
f8b457e61c
Merge branch '15.0up' into 15.0
2022-03-30 09:34:28 +02:00
Ferran Marcet
dd20907d53
Fix: Sales representative column crash on invoice list
2022-03-30 09:33:14 +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
a415711a66
Fix phpcs
2022-03-29 15:47:54 +02:00
Laurent Destailleur
5f2ba49dfa
Fix regression
2022-03-29 15:20:36 +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
Laurent Destailleur
e2425c10e0
Fix log
2022-03-28 21:12:57 +02:00
Laurent Destailleur
95dc25587c
Standardize code of the fetch_lines()
2022-03-28 13:50:47 +02:00
kamel
e6a989e51a
FIX - Case of invoice situation at 100% with a credit note
...
Set situation_final to 0 if is a credit note and the invoice source is a invoice situation (case when invoice situation is at 100%) when the credit note is validated
So we can continue to create new invoice situation
2022-03-25 17:00:23 +01:00
lvessiller
8a7b97bed1
FIX check thirdparty object loaded and properties exist
2022-03-25 16:47:41 +01: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
4a80f35aaa
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2022-03-23 17:26:25 +01:00
Laurent Destailleur
161e795759
Look and feel
2022-03-23 17:12:25 +01:00
Ferran Marcet
ccf8b01020
Fix: The origin of the stock movement is not being recorded
2022-03-22 13:46:55 +01:00
Laurent Destailleur
02e2f9815d
NEW Add option INVOICEREC_SET_AUTOFILL_DATE_START/END
2022-03-22 11:47:25 +01:00
Laurent Destailleur
8603d493ad
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/list.php
htdocs/install/mysql/tables/llx_partnership.key.sql
2022-03-19 17:34:26 +01:00
Laurent Destailleur
ed631b2b06
Fix doxygen, missing error message
2022-03-18 16:14:20 +01:00
Laurent Destailleur
a970f78c4e
css
2022-03-17 21:34:14 +01:00
ATM john
53f4fd2af8
Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14.0_fix_regression_selct_extrafield_search
2022-03-16 10:44:15 +01:00
ATM john
5e644ed0a4
Fix search degradation
2022-03-15 18:24:49 +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
Steve
dcf5d984b0
Merge branch 'dolibarrdevelop' into WIP_Facture_dolGetButtonAction
2022-03-09 11:49:34 +01:00
Thomas Negre
7f527b85b0
use double quotes to compose SQL requests
2022-03-09 09:34:50 +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
Thomas Negre
eda9622c9c
Facture: enhance validation by adding INVOICE_CHECK_POSTERIOR_DATE option
2022-03-09 09:25:52 +01:00
Thomas Negre
ad416ef792
Facture: create method willBeLastOfSameType()
2022-03-09 09:25:52 +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
lvessiller
19ad231012
FIX stickler-ci
2022-03-08 12:02:05 +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
John Livingston
1ece554c92
Fix: typo in template name
...
There was a typo in generated HTML comment.
2022-03-01 17:39:38 +01:00
Laurent Destailleur
358f21f06e
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/customreports.php
2022-03-01 16:48:29 +01:00
Laurent Destailleur
2a48dd349e
Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5
2022-03-01 16:38:06 +01:00
Laurent Destailleur
9cc79de31b
Clean code
2022-03-01 00:02:23 +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
Laurent Destailleur
99ddef0530
NEW Add API to get a tempalte invoice
2022-02-28 10:37:03 +01:00
Frédéric FRANCE
018fc53554
Merge remote-tracking branch 'upstream/develop' into productmerge
2022-02-27 08:40:01 +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
Frédéric FRANCE
b277ab9ee3
Merge remote-tracking branch 'upstream/develop' into productmerge
2022-02-22 21:49:17 +01:00
Laurent Destailleur
cebada1966
Merge pull request #20071 from frederic34/patch-1
...
NEW Hook getNomUrl available everywhere in tooltip of ref links
2022-02-16 20:36:02 +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
lvessiller
7e17167faf
NEW total mark rate in list
2022-02-16 11:45:29 +01:00
Frédéric FRANCE
eb77f10d7b
Merge remote-tracking branch 'upstream/develop' into productmerge
2022-02-15 19:11:24 +01:00
Frédéric FRANCE
935482ee22
uniformize
2022-02-15 19:04:18 +01:00
Frédéric FRANCE
a613553f37
Merge branch 'hookgetnomurl' into patch-1
2022-02-15 18:44:06 +01:00
Frédéric FRANCE
0ba912b1e5
add missing global
2022-02-15 18:14:44 +01:00
Christophe Battarel
ebada46a07
fix context for createfromclone
2022-02-15 12:14:48 +01:00
Frédéric FRANCE
710e970389
Update facture-rec.class.php
2022-02-15 11:13:22 +01:00
Christophe Battarel
01ef9b64ee
fix parent line on create with no originid
2022-02-15 10:34:10 +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
lvessiller
241a65e2ae
NEW add margin info in proposal and order list
2022-02-03 10:39:03 +01:00
Laurent Destailleur
ba77700619
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-02 17:58:09 +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
5a89da8876
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-02 14:08:19 +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
Laurent Destailleur
44bc197d03
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-01 13:25:45 +01:00
Laurent Destailleur
3a40078149
Fix length of list
2022-01-31 14:03:40 +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
Alexandre SPANGARO
5f0999665f
FIX Invoice - Clone - Don't report contact on an another thirdparty
2022-01-27 02:27:36 +01:00
Laurent Destailleur
512df3c580
Try to address a better solution for #19776
2022-01-26 15:12:42 +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
60b90056c4
Fix #yogosha8450
2022-01-19 15:20:10 +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
Laurent Destailleur
dbc2631d6a
Fix scrutinizer warnings
2022-01-13 19:19:36 +01:00
Laurent Destailleur
13510b9929
Clean sortfield, sortorder
2022-01-13 11:17:25 +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
Gauthier PC portable 024
1910423684
FIX : conf name is MAIN_ADD_LINE_AT_POSITION
2022-01-11 09:54:27 +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
Laurent Destailleur
cfec02aaae
Debug v15
2022-01-10 14:27:43 +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
423a4ea104
Debug v15
2022-01-09 19:48:38 +01:00
Laurent Destailleur
26e8496c46
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/card.php
2022-01-06 16:15:58 +01:00
Laurent Destailleur
2d0f4cab51
Merge pull request #19705 from atm-maxime/fix_supplier_credit_transfer
...
Fix supplier credit transfer
2022-01-06 16:10:53 +01:00
Laurent Destailleur
1e467c60f3
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/compta/facture/list.php
htdocs/product/stock/movement_list.php
2022-01-06 11:15:28 +01:00
Vincent Dieltiens
e58d783ced
add comment to parameter
2022-01-06 11:14:13 +01:00
Laurent Destailleur
708f5e5cf1
FIX #19751
2022-01-06 10:54:19 +01:00
Laurent Destailleur
e8408141e2
Merge pull request #19716 from jyhere/patch-2
...
FIx : addline() $type default value is misleading
2021-12-30 19:28:44 +01:00
Laurent Destailleur
9b14c68411
Update facture.class.php
2021-12-30 19:28:25 +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
jyhere
ddb8b406a0
FIx : addline() $type default value is misleading
...
It should refer to a Product type, not an Invoice type.
2021-12-30 10:17:03 +01:00
Maxime Kohlhaas
f9f1c7e3f8
Fix action protection
2021-12-28 18:32:02 +01:00
Maxime Kohlhaas
93393b82a3
Fix nav + translations on supplier invoice credit transfer
2021-12-28 17:40:25 +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
bb436e556d
Fix warnings
2021-12-21 15:23:56 +01:00
Laurent Destailleur
0387b9922e
FIX error message on sqlfilter in API
2021-12-20 20:49:32 +01:00
Laurent Destailleur
f09e603bf4
Try for FIX #19562
2021-12-19 20:43:24 +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
98ddfbf792
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/compta/facture/info.php
htdocs/compta/facture/list.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/fourn/facture/list.php
htdocs/mrp/mo_movements.php
htdocs/product/stock/movement_card.php
htdocs/product/stock/movement_list.php
htdocs/product/stock/replenishorders.php
htdocs/reception/card.php
htdocs/supplier_proposal/list.php
2021-12-19 00:17:37 +01:00
Laurent Destailleur
15b85258e8
Merge pull request #19634 from atm-gregr/FIX_Info_Tab_returns_Record_not_found
...
FIX : info tab on customer invoice record not found
2021-12-16 17:05:22 +01:00
Laurent Destailleur
e9b7fd0ef8
Update info.php
2021-12-16 17:05:12 +01:00
Laurent Destailleur
dc1118a3df
Update info.php
2021-12-16 17:04:25 +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
Jay Yeo
41e4e70c6e
Fix author searching include first and last name
2021-12-16 16:28:45 +07:00
atm-gregr
cc12baed57
fix info tab on customer invoice record not found
2021-12-16 10:19:42 +01:00
Laurent Destailleur
d80f83caf4
Clean code
2021-12-09 17:19:31 +01:00
Laurent Destailleur
69cd7ae2ab
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/don/card.php
htdocs/public/test/badges.php
htdocs/public/test/test_exec.php
2021-12-08 18:27:03 +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
Laurent Destailleur
106b8ceec5
Merge pull request #19574 from Hystepik/develop#5
...
Fix php8.0 warnings
2021-12-08 14:36:42 +01:00
Laurent Destailleur
b4de28f1db
Update index.php
2021-12-08 14:36:34 +01:00
Vincent Dieltiens
9ef2735520
Adds import for customer invoices and invoices lines
2021-12-07 09:33:18 +01:00
Laurent Destailleur
6886cca1fa
CSS
2021-12-07 02:35:46 +01:00
Laurent Destailleur
075faded47
FIX list of categories in stats of supplier invoices
...
Conflicts:
htdocs/compta/facture/stats/index.php
2021-12-02 18:48:15 +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
c6a071622a
Avoid a useless select
2021-12-01 15:26:53 +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
d84d09556c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-11-30 15:55:57 +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
Frédéric FRANCE
308998e21c
Merge remote-tracking branch 'upstream/develop' into productmerge
2021-11-28 21:14:12 +01:00
Laurent Destailleur
bf1dfac629
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/errors.lang
htdocs/product/stock/movement_list.php
2021-11-25 21:54:06 +01:00
Laurent Destailleur
971c892d98
Fix filter on recurrig field
2021-11-25 14:20:31 +01:00
Laurent Destailleur
78f94b1c76
Fix css and label for recurring invoices
2021-11-25 14:17:20 +01:00
Quentin VIAL-GOUTEYRON
632147ad88
object->id is always empty
2021-11-24 12:04:18 +01:00
Frédéric FRANCE
d601f62194
can merge products but experimental
2021-11-23 21:38:29 +01:00
Gauthier PC portable 024
2c2f456827
Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
2021-11-23 11:10:01 +01:00
Gauthier PC portable 024
74f5c092dc
FIX : use $linecount = count($this->lines);
2021-11-23 10:44:43 +01:00
Frédéric FRANCE
dc3bfcfb87
can modify tooltip by reference
2021-11-22 19:57:26 +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
72614ecc0d
Merge branch 'NEW/addline_with_position_choice_develop' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
2021-11-16 16:43:01 +01:00
Gauthier PC portable 024
375dcf7028
FIX : dev name
2021-11-16 16:42:48 +01:00
stickler-ci
19171d4f8e
Fixing style errors.
2021-11-16 15:15:55 +00:00
Gauthier PC portable 024
f664a977c6
Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
2021-11-16 16:05:17 +01:00
Gauthier PC portable 024
c55008e8af
NEW : insert_discount() functions handle
2021-11-16 16:02:55 +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
Alexandre SPANGARO
ce8b94a625
Translation
2021-11-15 04:26:14 +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
a635dc6df3
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/bookmarks/card.php
2021-10-31 16:50:34 +01:00
Laurent Destailleur
c73c962459
Merge pull request #19220 from frederic34/patch-4
...
remove duplicate code
2021-10-31 16:47:33 +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
3dcd1aa05d
Update info.php
2021-10-31 14:02:34 +01:00
Laurent Destailleur
8dfe4fe05f
Update note.php
2021-10-31 14:02:14 +01:00
Laurent Destailleur
65d59405da
Update document.php
2021-10-31 14:01:56 +01:00
Laurent Destailleur
0e2e8fe27f
Update contact.php
2021-10-31 14:01:40 +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
Frédéric FRANCE
dc15d09f12
remove duplicate code
2021-10-27 09:37:22 +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
Scrutinizer Auto-Fixer
5567310e44
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-10-25 20:07:31 +00: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
Scrutinizer Auto-Fixer
f7a41f1848
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-10-23 20:22:10 +00:00
Laurent Destailleur
ce4fe3f400
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-23 18:33:47 +02:00
Laurent Destailleur
8604f9b153
Clean DOM (remove ficheaddleft div)
2021-10-23 17:18:35 +02:00
andreubisquerra
85cc5851ef
BUG When load a draft invoice from history I can't add products
2021-10-23 16:07:47 +02:00
Frédéric FRANCE
9bd31d2b85
fix warnings
2021-10-23 07:13:08 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings
2021-10-22 22:15:59 +02:00
Laurent Destailleur
6c870bb3d1
Merge pull request #19059 from FHenry/fix_introduced_scrutinizer
...
fix: scrutinizer
2021-10-21 22:52:20 +02:00
Florian HENRY
10a518749d
fix: scrutinizer
2021-10-21 16:46:04 +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
c40a73162e
Look and feel v15
2021-10-18 21:20:58 +02:00
Laurent Destailleur
bd73545d08
Merge pull request #18985 from henrynopo/patch-5
...
Fix the rounding issue in case of multi-currency
2021-10-17 13:50:35 +02:00
Laurent Destailleur
dd0809b528
Fix trans labels status
2021-10-16 19:37:57 +02:00
Laurent Destailleur
bd52613331
Fix phpcs
2021-10-16 17:06:10 +02:00
Laurent Destailleur
7ff3e4253f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-16 13:01:27 +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
Laurent Destailleur
52890c64c1
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/compta/facture/stats/index.php
htdocs/compta/prelevement/create.php
2021-10-16 12:53:57 +02:00
Laurent Destailleur
faf80b94e9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/facture/stats/index.php
2021-10-16 12:49:18 +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
Laurent Destailleur
a6c3c6b7ec
url
2021-10-14 15:56:01 +02:00
Laurent Destailleur
3875d26a2f
Fix filter for supplierinvoice stats
2021-10-14 15:55:12 +02:00
Laurent Destailleur
db3d16f080
Fix filter tag for supplier invoice statistics
2021-10-14 15:43:35 +02:00
Laurent Destailleur
371c75e76a
FIX list of categories in stats of supplier invoices
2021-10-14 11:58:21 +02: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
Laurent Destailleur
da815476fd
Fix edit field from tab bank transfer of invoice
2021-10-11 02:00:12 +02:00
Laurent Destailleur
dbf2c0be7e
Fix warning
2021-10-11 01:49:50 +02:00
Laurent Destailleur
a57925b0b7
FIX edition of fields on credit transfer tab
2021-10-11 01:43:36 +02:00
Laurent Destailleur
977a596500
Fix edit link
2021-10-11 01:27:21 +02:00
Laurent Destailleur
7c1d955f6c
Fix: avoid to show warning in some cases
2021-10-11 01:23:00 +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
Marc de Lima Lucio
4059b64288
FIX: deposit payment terms: langs
2021-10-05 13:00:25 +02:00
Marc de Lima Lucio
cd1eb3b992
FIX: deposit payment terms: PHPDoc
2021-10-05 12:53:04 +02:00
Marc de Lima Lucio
fe62808595
NEW: deposit payment terms: hidden conf to detail lines imported from origin
2021-10-05 12:37:29 +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
Laurent Destailleur
950fccc186
Merge branch 'develop' into NEW_deposit_payment_terms
2021-10-04 19:06:42 +02:00
Marc de Lima Lucio
1b2494855d
NEW: deposit payment terms: set required invoice fields + filter payment terms with deposits in select + UI
2021-10-04 18:09:24 +02:00
Marc de Lima Lucio
6580c2e308
FIX: deposit payment terms: correctly untag deposit as created from an origin
2021-10-04 15:07:27 +02:00
Frédéric FRANCE
5c4b55fe7f
doxygen
...
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
2021-10-02 13:35:17 +02:00
Laurent Destailleur
2671eeb4e5
Responsive
2021-10-01 18:54:14 +02:00
Laurent Destailleur
3d4bb66853
Clean code
2021-09-30 15:59:47 +02:00
Marc de Lima Lucio
81ddc6c0f6
NEW: deposit payment terms: generate deposit from proposal
2021-09-30 12:41:07 +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
0176ab6057
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
2021-09-27 11:40:47 +02:00
Laurent Destailleur
9b825df158
Clean code
2021-09-27 11:36:40 +02:00
lmarcouiller
f88d12f55d
Fix #18809 : error on client tooltip
2021-09-24 11:16:34 +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
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
128f6d9a5c
Fix combo box for thirdparties in invoice stats used bad component
2021-09-23 02:38: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
60c11725ae
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-23 02:11:11 +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
e2c389a4a9
Fix delete invoice
2021-09-21 14:23:21 +02:00
Laurent Destailleur
b7105d572a
Fix delete of invoice not complete (some fk_invoice still filled)
2021-09-21 14:20:01 +02:00
stickler-ci
d919ef9c4c
Fixing style errors.
2021-09-20 17:57:10 +00:00
Yannick Warnier
c40b22facd
Add turnover homepage box
2021-09-20 19:41:13 +02:00
Laurent Destailleur
5c8fb38426
Fix add del* action into list of sensitive actions
2021-09-19 14:41:46 +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
5f5c659b76
Merge pull request #18710 from aspangaro/15a14
...
NEW Customer invoice template list - Add input date from/to
2021-09-17 11:50:29 +02:00
Christian Foellmann
fd1d4d9073
add missing css classes to buttons
2021-09-16 11:33:42 +02:00
Alexandre SPANGARO
cb37c42b5e
NEW Customer invoice template list - Add input date from/to
2021-09-14 04:50:05 +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
Laurent Destailleur
57a2ea3a53
Fix sql error
2021-09-08 19:49:24 +02:00
Laurent Destailleur
405beb77f5
Fix sql error
2021-09-08 19:45:55 +02:00
jpb
65a2486f94
merge conflict
2021-09-06 09:43:52 +02:00
Laurent Destailleur
0d6296e417
Merge pull request #18539 from GurvanKervern/undef4
...
Undef4
2021-09-05 01:57:16 +02:00
Laurent Destailleur
ee066ad725
Cast sql var
2021-09-03 21:25:43 +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
Laurent Destailleur
7c5621a2d4
Merge pull request #18552 from aspangaro/15a12
...
NEW Invoice list - Use complete country select field with EEC or not
2021-09-01 17:17:48 +02:00
Scrutinizer Auto-Fixer
312ca95feb
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-08-31 18:18:28 +00:00
Laurent Destailleur
0aa4868c34
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-31 13:14:01 +02:00
Alexandre SPANGARO
0132788266
NEW Invoice list - Use complete country select field with EEC or not
2021-08-30 13:56:31 +02:00
henrynopo
3240a3652d
Update card.php
2021-08-30 15:34:59 +08:00
GurvanKervern
b242387c43
Fix undef4-2
...
PHP8 warnings
2021-08-29 22:46:39 +08:00
Laurent Destailleur
81a8efd856
Restore error message
2021-08-28 20:14:23 +02:00
Laurent Destailleur
8870662200
Merge pull request #18475 from OPEN-DSI/v14-fix-invoice-fetch-not-found-syslog-level
...
FIX invoice fetch not found syslog debug level instead of error
2021-08-28 20:12:45 +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
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
f825d3fda4
Trans
2021-08-28 13:27:55 +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
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
lvessiller
a4a44faa7f
FIX change LOG_DEBUG with LOG_WARNING in syslog and remove sql error in syslog (already done)
2021-08-24 16:21:55 +02:00
Laurent Destailleur
8aa262f302
Merge pull request #18453 from aspangaro/14p15
...
FIX #18353 Invoice list translation issue
2021-08-24 15:29:32 +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
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
Laurent Destailleur
8b2c82dd23
Fix position of fields
2021-08-24 14:27:18 +02:00
Alexandre SPANGARO
efb78d7431
FIX Invoice list - Wrong name for column total_tva
2021-08-24 14:22:36 +02:00
Alexandre SPANGARO
7b829bc899
FIX Field already present in SQL request
2021-08-24 14:22:21 +02:00
Laurent Destailleur
4a32788bff
Merge pull request #18463 from aspangaro/14p14
...
FIX Invoice list - Wrong name for column total_tva
2021-08-24 14:20:57 +02:00
lvessiller
4efe2a0e09
FIX invoice fetch not found syslog debug level instead of error
2021-08-24 08:20:40 +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
d4b5ee6c85
Fix cast into variable into sql request.
2021-08-23 17:41:11 +02:00
Alexandre SPANGARO
56c23b79e0
FIX Invoice list - Wrong name for column total_tva
2021-08-22 14:02:33 +02:00
Alexandre SPANGARO
dd51e24afc
FIX Field already present in SQL request
2021-08-22 14:01:29 +02:00
Alexandre SPANGARO
8bdf58b942
FIX #18353 Invoice list translation issue
2021-08-20 21:42:43 +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
Laurent Destailleur
95721d36ab
Merge pull request #17687 from FHenry/dev_massaction_paid_custom_invoice
...
NEW : mass action paid customer invoice
2021-08-17 19:10:49 +02:00
Laurent Destailleur
794db94178
Update list.php
2021-08-17 19:08:55 +02:00
Laurent Destailleur
22e595e572
Merge pull request #18420 from henrynopo/patch-1
...
Customer Invoice - Multicurrency Remaining to Pay
2021-08-17 15:26:36 +02:00
Laurent Destailleur
92d6ad9597
Removed old simple POS module ('cashdesk' module)
2021-08-17 04:57:53 +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
Laurent Destailleur
896cdf4845
Update list.php
2021-08-11 22:24:07 +02:00
Laurent Destailleur
f9f1440226
Merge branch 'develop' into salesrepresentativeinorderandinvoicelist
2021-08-11 22:22:26 +02: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
0058e32207
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-02 19:03:38 +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
Laurent Destailleur
8077fae42e
Code comment
2021-08-02 17:56:58 +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
638a66fbb9
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/main.lang
2021-07-14 14:49:06 +02:00
Laurent Destailleur
b552c6b4fe
Fix status color
2021-07-14 14:32:05 +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
a8752bf097
Fixing style errors.
2021-07-11 07:46:34 +00:00
fr69400
c7ad0a59c9
Update note.php
2021-07-11 09:45:38 +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
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
12d591b848
css
2021-06-26 00:18:46 +02:00
Laurent Destailleur
ccffb36a37
CSS
2021-06-26 00:14:53 +02:00
Laurent Destailleur
6e3647af2c
Debug v14
2021-06-26 00:08:19 +02:00
Laurent Destailleur
d2485033d7
Fix deletion of template invoice
2021-06-25 23:10:42 +02:00
lvessiller
24acc82ca6
NEW get errors on create invoice from clone
2021-06-25 16:40:39 +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
c9d4ccd40a
Merge pull request #17845 from atm-gauthier/fix_libstatus_invoice_in_linked_objects_block
...
FIX : need to add payment sum to getlibstatus function in object linked block (bug still exists in 13.0)
2021-06-23 10:48:22 +02:00
Laurent Destailleur
56212508e7
Update linkedobjectblock.tpl.php
2021-06-23 10:47:23 +02:00
Laurent Destailleur
7046791377
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-19 14:16:39 +02:00
Laurent Destailleur
53295a0cb1
Fix phpcs
2021-06-18 01:06:28 +02:00
Laurent Destailleur
88ff0e4795
Fix PHPCS
2021-06-18 00:59:18 +02:00
Gauthier PC portable 024
564a3b66c2
FIX : method exists
2021-06-14 17:08:16 +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
aceeb9558f
css
2021-06-14 01:13:46 +02:00
Laurent Destailleur
34cebe6aa3
Look and feel v14
2021-06-14 01:11:39 +02:00
Frédéric FRANCE
791e4ab056
fix warning
2021-06-13 15:59:22 +02:00
Laurent Destailleur
f13dcb5376
Fix merge
2021-06-12 15:44:03 +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
86eea2c4fc
Update list.php
2021-06-10 20:55:00 +02:00
Frédéric FRANCE
3f40a65f26
fix warnings
2021-06-10 20:53:29 +02:00
Laurent Destailleur
1bf63c7862
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/lib/functions.lib.php
2021-06-10 16:53:09 +02:00
Laurent Destailleur
1950e50c89
Fix test
2021-06-10 16:31:28 +02:00
Laurent Destailleur
c8c9fb7700
FIX #17847
2021-06-10 16:29:30 +02:00
Alexandre SPANGARO
08186fdff1
Fix warning - search_societe is already present
2021-06-10 06:28:09 +02:00
Alexandre SPANGARO
b216c81c60
FIX Customer invoice list - Pagination lost search_date_xxx information
2021-06-10 06:22:03 +02:00
Laurent Destailleur
53af424a3d
Fix total tva
2021-06-10 02:12:29 +02:00
Laurent Destailleur
5f925d9e3b
Fix total -> total_ht
2021-06-10 02:10:58 +02:00
Laurent Destailleur
ae6d2ba9b5
Fix missing user creation/modif of template invoice
2021-06-10 01:56:20 +02:00
Laurent Destailleur
9afe8e54a7
Fix
2021-06-10 00:41:15 +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
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
Gauthier PC portable 024
e64c27e1c3
FIX : need to add payment sum to getlibstatus function in object linked block
2021-06-08 10:27:33 +02:00
Laurent Destailleur
2182e7fd54
Look and feel v14
2021-06-04 14:36:52 +02:00
Laurent Destailleur
27018bd4b4
Fix group by
2021-06-04 14:25:32 +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
4b47611e23
Debug v14
2021-05-25 21:21:09 +02:00
Laurent Destailleur
91f85abb7e
Fix only comment to understand code are allowed
2021-05-20 14:55:37 +02:00
Florian HENRY
d70bbe29b5
fix
2021-05-20 14:03:18 +02:00
Florian HENRY
7a9102ac60
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_massaction_paid_custom_invoice
2021-05-20 14:02:05 +02:00
Florian HENRY
4d7b09ff2a
done
2021-05-20 14:00:43 +02:00
Laurent Destailleur
afd9c09c8f
Merge pull request #17685 from FHenry/dev_fix_search_filter_company_Var
...
fix: change societe by company varaible name in all file
2021-05-20 13:54:01 +02:00
Florian HENRY
5e6d6ccf67
same bug on invoie list
2021-05-20 13:45:52 +02:00
Florian HENRY
7c6ac86d32
ongoing
2021-05-20 13:41:23 +02:00
Florian HENRY
62bc6e9e1f
on going
2021-05-20 13:15:32 +02:00
Florian HENRY
7874be6e37
bad comment remove
2021-05-20 12:48:18 +02:00
Florian HENRY
d93cf0beb7
fix: change societe by company varaible name in all file
2021-05-20 12:36:26 +02:00
Laurent Destailleur
dbd7292cd6
Replace doubleval into floatval
2021-05-20 09:22:55 +02:00
Sylvain Legrand
a3d1b49c65
Error in list when using alias name of thirdparty
2021-05-19 19:08:58 +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
Anthony Berton
c02e3eed6b
checked
2021-05-18 18:45:07 +02:00
Laurent Destailleur
8e39eff180
Look and feel v14
2021-05-18 18:18:00 +02:00
Laurent Destailleur
74f35177ff
Fix group by
2021-05-18 13:20:14 +02:00
Laurent Destailleur
2ef713bd5f
Merge branch 'develop' into look_feel_user_author_list
2021-05-18 12:27:30 +02:00
Laurent Destailleur
7b9161ec63
Merge pull request #17644 from bb2a/thirdparty_infos_list
...
Add popup thirdparty info in list
2021-05-18 12:15:51 +02:00
Laurent Destailleur
b6dbe45242
Fix permissions on page to move position of file
2021-05-18 01:58:54 +02:00
Anthony Berton
70a062e2c1
change position
2021-05-17 23:59:42 +02:00
Anthony Berton
6fe9fe330d
delete fetch
2021-05-17 23:54:31 +02:00
Anthony Berton
58db723502
thirdparty info popup list
2021-05-17 23:27:33 +02:00
Anthony Berton
31cd71d8a3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into look_feel_user_author_list
2021-05-17 18:34:41 +02:00
Anthony Berton
68130ec637
Merge branches 'develop' and 'develop' of https://github.com/Dolibarr/dolibarr into salesrepresentativeinorderandinvoicelist
2021-05-17 18:34:20 +02:00
Anthony Berton
09ab930806
sale_representative_order_invoice_list
2021-05-17 18:31:19 +02:00
Anthony Berton
0b7f474dd3
look_feel user author in list
2021-05-17 18:04:21 +02:00
Laurent Destailleur
608e4e8891
Merge pull request #17601 from ptibogxiv/patch-426
...
NEW report contact/adresses on credit note from invoice
2021-05-17 09:12:12 +02:00
Laurent Destailleur
4768729c09
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/core/class/rssparser.class.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
htdocs/expedition/list.php
2021-05-17 07:57:32 +02:00
stickler-ci
50d4d28c14
Fixing style errors.
2021-05-14 11:54:50 +00:00
Ferran Marcet
ce6df0ee4a
FIX: Filter of the dates in the lists is lost
2021-05-14 13:50:12 +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
bccd1b9a41
Update prelevement.php
2021-05-11 19:21:08 +02:00
Frédéric FRANCE
680092cb8a
Merge remote-tracking branch 'upstream/develop' into uniformizecode
2021-05-11 18:09:05 +02:00
Laurent Destailleur
73972bcbd0
More complete log
2021-05-11 10:30:46 +02:00
Frédéric FRANCE
1d38dc11c6
uniformize supplier cards
2021-05-07 21:28:35 +02:00
Laurent Destailleur
f2e61ff807
Fix substitution into topic
2021-05-04 18:04:09 +02:00
Laurent Destailleur
526235d020
Fix substitution of mix html/nohtml
...
Fix send email reminder for past due date of invoices
More PHPUnit test
2021-05-04 13:33:18 +02:00
Laurent Destailleur
c82317c8af
Fix missing include
2021-05-04 11:06:24 +02:00
Laurent Destailleur
1c95e2b7c7
FIX #17453
2021-05-03 14:58:29 +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
Laurent Destailleur
e99355a0c2
Clean html
2021-04-30 15:22:17 +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
655056ed31
Debug v14
2021-04-29 12:10:55 +02:00
lmarcouiller
97633e34f2
Fix : Bug facture.class.php
2021-04-27 16:47:27 +02:00
Laurent Destailleur
4b204301a9
Enhance logs
2021-04-27 03:25:49 +02:00
Laurent Destailleur
e82965090f
Merge pull request #17395 from Robin-Yann/13-fix-combo-prospect
...
13 fix combo prospect
2021-04-27 01:18:57 +02:00
Laurent Destailleur
efbed70286
Update card.php
2021-04-27 01:17:26 +02:00
Laurent Destailleur
d138e7410b
Clean code
2021-04-26 19:12:23 +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
389b71bc7e
Clean API
2021-04-25 19:21:48 +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
d0cc64479d
Fix protect sql
2021-04-24 20:18:11 +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
61df76dd9a
Fix pb in date format %a %b when using a negative timezone
...
Enhance date management and unit tests.
2021-04-19 12:48:08 +02:00
Laurent Destailleur
23b11491d2
Can filter also on payment mode
2021-04-19 11:11:01 +02:00
Laurent Destailleur
83b5a325df
Load of template before the loop.
2021-04-19 10:47:12 +02:00
Laurent Destailleur
a74b237a7b
Add a schedule dtask to send reminder by email on date due.
2021-04-19 10:35:19 +02:00
Laurent Destailleur
aec2212b44
Merge pull request #17293 from cmfpmatik/cmfpmatik-patch-16042021
...
Update facture list.php
2021-04-16 20:39:23 +02:00
Oarces DEV
593e23220d
Update list.php
...
Add filter for "Bill Short Status Draft" and "Bill Short Status Draft", that they has can be viewed together.
Secretaries appreciate having this overall visibility.
2021-04-16 14:34:23 +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
bd1aa38c64
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
2021-04-15 12:04:08 +02:00
Laurent Destailleur
dcf460e248
Use css on img_picto
2021-04-14 12:28:01 +02:00
Anthony Berton
707bf5adca
picto_mass_actions
2021-04-14 10:20:34 +02:00
Laurent Destailleur
4dfc90f8cb
Merge pull request #17256 from OGPayet/fix/ComptaFactureDateClosingOptionPosition
...
fix date closing option position
2021-04-13 23:03:02 +02:00
Laurent Destailleur
358bb87ae2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/payments.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/projet/card.php
htdocs/public/payment/newpayment.php
htdocs/societe/list.php
htdocs/ticket/document.php
2021-04-13 20:19:05 +02:00
Pierre Payet
75ed5e45f2
fix date closing option position
2021-04-13 17:21:51 +02:00
Alexandre SPANGARO
4b9bf40a8f
move include_once to include when it's a tpl
2021-04-12 21:25:58 +02:00
Laurent Destailleur
8a62d97b89
Remove one thousand of useless files
2021-04-12 15:57:16 +02:00
Laurent Destailleur
667481acd5
Fix #yogosha5832 - Missin test on permission for /index routes on APIs
2021-04-08 19:05:28 +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
2e862f815a
Fix field total_ht
2021-04-07 00:44:01 +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
stickler-ci
1419b75f22
Fixing style errors.
2021-04-06 08:32:27 +00:00
Alexandre SPANGARO
36e4f5aa22
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-04-06 10:29:44 +02:00
Alexandre SPANGARO
82b652df8a
NEW: Add deposit on supplier invoice (& somes ajustments)
2021-04-06 09:15:34 +02:00
Laurent Destailleur
a3fb8d3e14
Factorize code
2021-04-05 19:34:56 +02:00
Alexandre SPANGARO
f64d0377c5
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-04-04 06:03:41 +02:00
Laurent Destailleur
e01b6b6789
FIX filter on date on invoice list
2021-03-31 18:39:59 +02:00
Laurent Destailleur
fb7cfe6c50
Fix sql error
2021-03-30 19:15:20 +02:00
Laurent Destailleur
3744bc6a7a
FIX #yogosha5746 - next step (work in progress)
2021-03-30 18:17:13 +02:00
Laurent Destailleur
fae3cca494
FIX #yogosha5746 - next step (work in progress)
2021-03-30 17:45:15 +02:00
Laurent Destailleur
6e422d26f3
FIX #yogosha5746 - next step (wip)
2021-03-30 16:20:18 +02:00
Laurent Destailleur
fb84608586
Clean sql
2021-03-30 03:37:54 +02:00
Laurent Destailleur
b702d2b534
Fix CSRF for more GET
2021-03-29 22:58:44 +02:00
Laurent Destailleur
0740633ec8
Update facture-rec.class.php
2021-03-29 20:42:59 +02:00
Laurent Destailleur
a4987c6e4f
Merge branch 'develop' into 14a22
2021-03-29 20:35:35 +02:00
Laurent Destailleur
5c2ee240b2
FIX #yogosha5752
2021-03-29 15:59:37 +02:00
Laurent Destailleur
3a4bb69c05
FIX #yogosha5749
2021-03-29 15:32:09 +02:00
Laurent Destailleur
ce1f8289a4
FIX #yogosha5746
2021-03-29 15:07:23 +02:00
Laurent Destailleur
b929641fe1
Look and feel v14
2021-03-29 13:00:17 +02:00
Laurent Destailleur
a5d84200dc
Clean code for invoice list
2021-03-28 19:22:04 +02:00
Alexandre SPANGARO
2a1cc04b66
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-03-28 06:16:33 +02:00
Laurent Destailleur
eeba9e4d50
Code comment
2021-03-24 21:58:06 +01:00
Laurent Destailleur
21a9779fe2
FIX inconsistency in margin recording with option "Force to sale price"
2021-03-24 21:49:45 +01:00
Laurent Destailleur
ca1715df96
Add some protection for SQL injection
2021-03-22 13:31:06 +01:00
Laurent Destailleur
6a0e0f4c06
Fix #ygosha5698
2021-03-22 12:10:51 +01:00
Laurent Destailleur
15440917b1
Fix #ygosha5698
2021-03-22 11:30:18 +01:00
Laurent Destailleur
e334e83a64
Merge branch 'develop' into 14a22
2021-03-20 13:42:54 +01:00
Laurent Destailleur
d8aa5f5eab
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-20 12:43:07 +01:00
Laurent Destailleur
3d3a7bfd37
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
htdocs/projet/card.php
htdocs/projet/contact.php
htdocs/projet/element.php
htdocs/projet/tasks.php
htdocs/projet/tasks/comment.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/document.php
htdocs/projet/tasks/note.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
2021-03-20 12:42:46 +01:00
Laurent Destailleur
7f6044c52e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/projet/card.php
htdocs/projet/contact.php
htdocs/projet/tasks/comment.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/document.php
htdocs/projet/tasks/task.php
2021-03-20 12:18:40 +01:00
Laurent Destailleur
827a952dca
Merge pull request #16839 from dolibit-ut/patch-130
...
Update card.php
2021-03-20 11:49:18 +01:00
Laurent Destailleur
3edeb8b4aa
Merge pull request #16840 from dolibit-ut/patch-131
...
Update document.php
2021-03-20 11:49:06 +01:00
Frédéric FRANCE
bae1770176
uniformise comments to remove nested comments
2021-03-20 10:00:24 +01:00
Frédéric FRANCE
2de2f1ce4d
fix nested comments for doxygen
2021-03-20 09:02:29 +01:00
Laurent Destailleur
d83d005284
FIX #yogosha5674
2021-03-19 12:44:59 +01:00
UT from dolibit
46c23807e9
Update document.php
...
$helpurl -> $help_url
2021-03-19 09:38:33 +01:00
UT from dolibit
b4e929e57f
Update card.php
...
$helpurl -> $help_url
2021-03-19 09:36:49 +01:00
Laurent Destailleur
3522af926a
Merge pull request #16799 from AlexisLaurier/addInvoiceListHook
...
invoice list - add new standard hooks
2021-03-18 22:58:18 +01:00
Laurent Destailleur
43494df56c
Merge pull request #16790 from AlexisLaurier/addGetNomUrlToInvoice
...
add invoice getNomUrl hook
2021-03-18 22:57:37 +01:00
Laurent Destailleur
461d748f97
Fix #yogosha235
2021-03-18 20:27:36 +01:00
Alexis LAURIER
5b72193f0d
invoice list - ajust hooks
2021-03-18 17:06:49 +01:00
Alexis LAURIER
ada5d728b5
invoice list - ajust hooks
2021-03-18 17:00:57 +01:00
Alexis LAURIER
06bc999614
Add group by and having hooks on invoice list
2021-03-18 16:51:02 +01:00
Alexis LAURIER
c3f8e0e397
invoice list - add new standard hook
2021-03-18 16:21:54 +01:00
Alexis LAURIER
b416223194
fix
2021-03-18 11:16:49 +01:00
Alexis LAURIER
c33347b461
add invoice getNomUrl hook
2021-03-18 11:10:43 +01:00
Laurent Destailleur
73e55f1b73
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-17 18:44:47 +01:00
Laurent Destailleur
0da5c89973
Look and feel v14
2021-03-17 18:24:37 +01:00
Frédéric FRANCE
519b08b782
fix php8 warnings
2021-03-16 18:25:25 +01:00
Laurent Destailleur
e00e6cfd9a
Merge pull request #16721 from aspangaro/14a25
...
Translation "Generated documents"
2021-03-16 10:25:31 +01:00
Alexandre SPANGARO
03481a0197
Uniformize translation
2021-03-16 04:22:43 +01:00
Alexandre SPANGARO
4fd24c6855
Translation "Generated documents"
2021-03-16 04:04:18 +01:00
Alexandre SPANGARO
6e17a588bb
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-03-16 03:26:28 +01:00
Laurent Destailleur
cc10106a21
Fix protection on int
2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7
Fix yogosha #5627
2021-03-14 11:48:39 +01:00
Laurent Destailleur
ab89d85095
Fix for php8
2021-03-08 11:33:07 +01:00
Laurent Destailleur
4d409e23f5
Missing declaration of properties
2021-03-08 09:16:33 +01:00
Laurent Destailleur
a1d97274fb
Clean code for php8
2021-03-08 09:14:23 +01:00
Laurent Destailleur
1affaa8c87
fix phpunit
2021-03-07 20:26:36 +01:00
Laurent Destailleur
1ca3e433d2
Fix phpunit
2021-03-07 19:55:09 +01:00
Laurent Destailleur
0f7085154b
Fix phpunit
2021-03-07 19:47:55 +01:00
Laurent Destailleur
91245e22d4
Fix phpunit phpv8
2021-03-07 19:16:09 +01:00
Laurent Destailleur
63aa2f4ec2
Fix phpunit
2021-03-06 12:50:38 +01:00
Laurent Destailleur
7959bc99d7
Fix phpcs
2021-03-06 10:39:51 +01:00
Laurent Destailleur
3cbced439a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/listevents.php
htdocs/compta/bank/line.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/paiement/cheque/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/ticket.lib.php
htdocs/core/modules/mailings/modules_mailings.php
htdocs/core/tpl/extrafields_view.tpl.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/cron/list.php
htdocs/expedition/card.php
htdocs/mrp/mo_list.php
htdocs/product/stock/productlot_card.php
htdocs/public/emailing/mailing-read.php
htdocs/public/emailing/mailing-unsubscribe.php
htdocs/ticket/list.php
test/phpunit/FactureRecTest.php
2021-03-05 19:29:09 +01:00
Laurent Destailleur
31845e1dae
Fix phpcs
2021-03-04 00:04:43 +01:00
Laurent Destailleur
6503c81f47
FIX #16530
2021-03-03 23:55:28 +01:00
Laurent Destailleur
30dd4ac6ec
FIX #16530
2021-03-03 22:52:02 +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
stickler-ci
35cb48d649
Fixing style errors.
2021-03-02 11:37:46 +00:00
Laurent Destailleur
1d642f49f7
Update facture.class.php
2021-03-02 12:37:24 +01:00
Florian HENRY
d063533efb
Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0
2021-03-02 09:46:05 +01:00
Florian HENRY
d7500b1609
fix php warning
2021-03-02 09:45:49 +01:00
Laurent Destailleur
cffea1889f
FIX #16325
2021-03-02 01:17:28 +01:00
Frédéric FRANCE
a4e25359e7
add missing rule
2021-03-01 20:37:16 +01:00
Alexandre SPANGARO
94a861c1c8
Code enhanced - Standardize field name
2021-03-01 04:07:31 +01:00
Alexandre SPANGARO
7a3dfda8ee
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-02-28 21:30:25 +01:00
Laurent Destailleur
886cbc61c8
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/core/boxes/box_factures_fourn.php
htdocs/core/boxes/box_factures_fourn_imp.php
htdocs/core/boxes/box_ficheinter.php
htdocs/core/boxes/box_members.php
htdocs/core/boxes/box_propales.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/class/fournisseur.facture.class.php
2021-02-28 13:37:45 +01:00
Laurent Destailleur
2ce76133f4
FIX #16487
2021-02-28 12:59:58 +01:00
Alexandre SPANGARO
ca7958f273
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-02-28 07:32:23 +01:00
Laurent Destailleur
ccffa7e2a0
Merge pull request #16412 from frederic34/compta_codesyntax
...
code syntax compta directory
2021-02-26 10:21:22 +01:00
Laurent Destailleur
d4a78bf7c6
Removed useless field
2021-02-24 10:24:54 +01:00
Frédéric FRANCE
61600a9e65
code syntax compta directory
2021-02-23 21:09:01 +01:00
Laurent Destailleur
2642e1d1b3
Code syntax
2021-02-23 15:35:16 +01:00
Laurent Destailleur
888c072af0
NEW Can set a percentage when creating an invoice from another object
2021-02-23 14:48:54 +01:00
Laurent Destailleur
8c1902be1b
Missing space
2021-02-22 18:40:15 +01:00
Alexandre SPANGARO
d04b04c10f
Fix
2021-02-22 06:22:47 +01:00
Alexandre SPANGARO
70dddd9bdf
Index & module
2021-02-22 05:58:46 +01:00
Laurent Destailleur
1bb27f8f18
Responsive
2021-02-21 13:12:16 +01:00
Laurent Destailleur
71f537e4c1
Responsive
2021-02-19 22:12:03 +01:00
Laurent Destailleur
2be6992916
Fix include_once into include for inc.php file. See comment in #16338
2021-02-19 16:10:19 +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
Laurent Destailleur
dabf9d796a
FIX Rename title of template invoice
2021-02-15 22:16:01 +01:00
Laurent Destailleur
44b3221aaf
FIX Rename title of template invoice
2021-02-15 22:15:14 +01:00
Laurent Destailleur
be3703a05b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2021-02-15 16:46:55 +01:00
Laurent Destailleur
f0e234c874
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/bank/various_payment/list.php
2021-02-15 16:45:17 +01:00
Laurent Destailleur
6132843586
FIX Filter on date of next generation on template invoices
2021-02-15 16:43:24 +01:00
Laurent Destailleur
1b129831a9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-09 14:09:46 +01:00
Laurent Destailleur
48a4ed656b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/projet/element.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2021-02-09 14:08:49 +01:00
Laurent Destailleur
89bda722bf
Merge pull request #16232 from frederic34/paymentvat
...
use camelCaps name
2021-02-09 13:29:40 +01:00
Frédéric FRANCE
e2d2048522
deprecate non camelCaps functions
2021-02-09 13:25:55 +01:00
Frédéric FRANCE
04c25a01af
deprecate non camelCaps functions
2021-02-09 13:10:11 +01:00
Frédéric FRANCE
f394e55ade
deprecate non camelCaps functions
2021-02-09 10:26:17 +01:00
Frédéric FRANCE
fe9ee5a398
deprecate non camelCaps functions
2021-02-09 09:49:37 +01:00
Frédéric FRANCE
6d961a1f79
deprecate non camelCaps functions
2021-02-09 09:40:07 +01:00
Florian HENRY
dbbebba497
this->errors is set on triggers action must be set by callers
2021-02-08 20:44:40 +01:00
Frédéric FRANCE
898bf55202
Merge remote-tracking branch 'upstream/develop' into facturerec
2021-02-08 20:21:46 +01:00
Frédéric FRANCE
815f3602e3
clean deprecated modelpdf to model_pdf
2021-02-08 18:30:09 +01:00
Laurent Destailleur
8041ef641a
Merge branch 'develop' into dev_typent_jax_workcorrectly
2021-02-08 15:29:36 +01:00
Laurent Destailleur
f0e1c02caa
Look and feel v14 - Use placeholder on combolists
2021-02-06 00:05:24 +01:00
Laurent Destailleur
c441b54521
NEW If not logo defined, can use squarred logo on login page
2021-02-05 12:07:39 +01:00
Laurent Destailleur
54be4f282b
Fix bad function name
2021-02-05 10:56:33 +01:00
Laurent Destailleur
445e7a1e0c
Clean code
2021-02-04 10:58:07 +01:00
stickler-ci
149d2a1d55
Fixing style errors.
2021-02-04 08:52:16 +00:00
Florian HENRY
ec41bf58e5
always ajax now
2021-02-04 09:48:17 +01:00
Florian HENRY
2d77787bba
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_typent_jax_workcorrectly
2021-02-04 09:06:36 +01:00
Florian HENRY
86e9398b79
no inner join
2021-02-04 09:05:58 +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
9ac2dc1a6e
Fix phpcs
2021-02-03 20:42:30 +01:00
