Gauthier PC portable 024
1e0d7d92a9
NEW : addline with position choice when MAIN_VIEW_LINE_NUMBER is enabled
2021-11-16 14:09:18 +01:00
Laurent Destailleur
5613ec71d6
Fix syntax
2021-11-07 17:48:01 +01:00
Laurent Destailleur
2b6d296e63
Rename var
2021-11-05 13:58:11 +01:00
Laurent Destailleur
d32ecfe5aa
Merge pull request #19291 from OPEN-DSI/fix_00019
...
NEW: Can show Paid button if invoice or supplier invoice has no payments with global
2021-11-05 13:37:39 +01:00
Laurent Destailleur
bc7b035846
Update card.php
2021-11-05 13:11:54 +01:00
Laurent Destailleur
02200b9810
Update card.php
2021-11-05 13:10:44 +01:00
Vincent Dieltiens
a359c7a681
Handle case where credit note has no source invoice
2021-11-03 14:22:08 +01:00
kamel
d91c24233c
NEW: Can show Paid button if invoice or supplier invoice has no payments with global INVOICE_CAN_FORCE_PAID_WHEN_NO_PAIEMENTS and SUPPLIER_INVOICE_CAN_FORCE_PAID_WHEN_NO_PAIEMENTS
2021-11-02 16:43:09 +01:00
Laurent Destailleur
fe7e1d4118
Look and feel v15
2021-10-29 09:40:38 +02:00
Laurent Destailleur
f2cd7a7a56
Removed the div class="ficheaddleft"
2021-10-24 00:37:37 +02:00
Laurent Destailleur
e43b33028c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
2021-10-20 15:06:10 +02:00
Laurent Destailleur
f8010dfcbc
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/reception/list.php
htdocs/takepos/pay.php
2021-10-16 13:01:03 +02:00
stickler-ci
fb79aaeb0c
Fixing style errors.
2021-10-15 07:19:49 +00:00
Henry
316bc16634
Update card.php
2021-10-15 15:05:13 +08:00
lvessiller
be4a00213c
FIX optional visibility on create card
2021-10-08 15:58:08 +02:00
Laurent Destailleur
68ac62d09c
Fix phpcs
2021-10-07 11:05:06 +02:00
Laurent Destailleur
2cb0edb5eb
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/project/suggestbooth.php
htdocs/public/project/suggestconference.php
2021-10-07 11:01:53 +02:00
Laurent Destailleur
9b5909300e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/paiement/card.php
htdocs/fourn/facture/card.php
2021-10-07 11:00:00 +02:00
Laurent Destailleur
e3032ef1c4
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/fourn/facture/card.php
2021-10-06 16:06:25 +02:00
Laurent Destailleur
10f0434116
Update card.php
2021-10-06 15:30:19 +02:00
Florian HENRY
6d00097c89
fix
2021-09-30 16:37:52 +02:00
Florian HENRY
d0508d557b
fix: checkbox for line selection between supplier order and supplier invoice was infective
2021-09-30 14:56:02 +02:00
Laurent Destailleur
37603b451a
Fix token in url
2021-09-27 12:24:01 +02:00
Laurent Destailleur
d38c3028eb
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/class/expensereport.class.php
2021-09-23 02:41:53 +02:00
Laurent Destailleur
51b6318f88
FIX Test when date of invoie is in future (pb with TZ and offset)
2021-09-23 02:14:01 +02:00
Laurent Destailleur
1e0a7e4342
FIX Test when date of invoie is in future (pb with TZ and offset)
2021-09-23 02:10:39 +02:00
lvessiller
991a7ffd43
FIX selected lines on supplier invoice create
2021-09-21 11:04:59 +02:00
Laurent Destailleur
d760686239
Fix case of newtoken()
2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a
Fix add action delete* as sensitive action
2021-09-18 22:04:41 +02:00
Laurent Destailleur
8bdc53f469
Fix Add action classify as sensitive actions
2021-09-18 20:49:24 +02:00
Laurent Destailleur
62b721a904
Add deletecontact as sentitive action
...
Replace dol_buildpath with DOL_URL_ROOT
2021-09-18 19:34:46 +02:00
Laurent Destailleur
034c5651c8
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/eventorganization/class/conferenceorbooth.class.php
htdocs/langs/en_US/eventorganization.lang
htdocs/public/eventorganization/attendee_subscription.php
2021-09-08 22:13:35 +02:00
Laurent Destailleur
30856d5b18
FIX Relative discount with high nb of decimals
2021-09-08 22:09:02 +02:00
Laurent Destailleur
c4621f0433
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2021-09-03 18:04:14 +02:00
Laurent Destailleur
2e3b6b2fc8
Backport sql injection fix from develop
2021-09-03 18:00:28 +02:00
Laurent Destailleur
77e9f15360
Work on #18448
2021-09-02 22:52:17 +02:00
Laurent Destailleur
8600d8d00d
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-01 22:50:06 +02:00
henrynopo
7bf6daaca7
Update card.php
2021-08-30 15:33:26 +08:00
Laurent Destailleur
301d7134b3
Merge branch 'develop' into patch-2
2021-08-28 17:37:54 +02:00
stickler-ci
63427638d8
Fixing style errors.
2021-08-28 14:54:16 +00:00
henrynopo
444786b34f
Update card.php
2021-08-28 22:52:06 +08:00
Laurent Destailleur
0db67b40a0
Merge pull request #18525 from cfoellmann/PR/thirdparty-links
...
change links for thirdparty to target the type customer|supplier tab
2021-08-28 15:27:13 +02:00
Laurent Destailleur
2dd91bf312
Clean code
2021-08-27 23:36:06 +02:00
Laurent Destailleur
3b6559b1a6
Clean code by adding cast int.
2021-08-27 18:53:45 +02:00
Christian Foellmann
9752501ef6
change links for thirdparty to target the type customer|supplier tab
2021-08-27 15:32:53 +02:00
henrynopo
054b466e0a
Update card.php
2021-08-26 09:40:44 +08:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function
...
improve forms - buttonsSaveCreate()
2021-08-24 15:26:03 +02:00
henrynopo
73c0471ead
Fix error of supplier invoice (variable amount)
...
This update fixed the coding error for addline of deposit invoice for variable amount.
In addition, there is no invoice template for supplier invoice, so I also corrected the respective description.
2021-08-24 15:12:15 +02:00
henrynopo
b4096dc057
Fix error of supplier invoice (variable amount)
...
This update fixed the coding error for addline of deposit invoice for variable amount.
In addition, there is no invoice template for supplier invoice, so I also corrected the respective description.
2021-08-22 13:26:46 +08:00
Christian Foellmann
d706c3b1ec
use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination
2021-08-20 14:41:30 +02:00
stickler-ci
ee65860b27
Fixing style errors.
2021-08-16 01:45:33 +00:00
henrynopo
76c39a86a0
Supplier Invoice - Multicurrency remainder to pay
...
Added multicurrency remainder to be paid.
2021-08-16 09:44:09 +08:00
Laurent Destailleur
b7c42c70ef
Fix date for planned entries
2021-07-09 13:33:37 +02:00
Laurent Destailleur
7013f01a41
Fix look and feel v14
2021-07-04 21:14:46 +02:00
Laurent Destailleur
756786f717
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/core/class/discount.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/modFournisseur.class.php
htdocs/fourn/facture/card.php
htdocs/holiday/list.php
htdocs/paybox/admin/paybox.php
htdocs/paypal/admin/paypal.php
htdocs/product/price.php
htdocs/projet/activity/perday.php
htdocs/projet/activity/permonth.php
htdocs/projet/activity/perweek.php
htdocs/stripe/admin/stripe.php
2021-06-11 19:05:05 +02:00
Laurent Destailleur
77efbda148
Fix responsive
2021-06-10 20:04:21 +02:00
Frédéric FRANCE
4e530c2486
Update card.php
2021-06-08 12:05:45 +02:00
Laurent Destailleur
36eaad89aa
Merge pull request #17777 from dolibit-ut/patch-339
...
Update card.php
2021-06-04 10:35:11 +02:00
Laurent Destailleur
350a421544
Update card.php
2021-06-04 08:41:26 +02:00
Frédéric FRANCE
ca66cdad01
debug intracomm report transport mode
2021-06-03 21:47:10 +02:00
UT from dolibit
7aae5be54a
Update card.php
2021-05-31 10:36:43 +02:00
Laurent Destailleur
217ee260c2
css
2021-05-19 15:11:47 +02:00
Laurent Destailleur
1c477d2131
Update card.php
2021-05-11 19:21:38 +02:00
Frédéric FRANCE
1d38dc11c6
uniformize supplier cards
2021-05-07 21:28:35 +02:00
Laurent Destailleur
e5b49ce0a2
Merge pull request #17448 from LuferGonn/fourn_facture_change_001
...
Update fourn/facture/card.php: Change position(ExtraFields)
2021-05-03 14:12:07 +02:00
Laurent Destailleur
d1f11d2e65
Merge pull request #17429 from fr69400/develop
...
FIX formAddObjectLine cant be overloaded by hook
2021-05-03 13:16:45 +02:00
Luis Fernando
6fb256822b
Update card.php: Change position(ExtraFields)
2021-04-30 21:07:24 -05:00
stickler-ci
8fda2ba2b4
Fixing style errors.
2021-04-29 13:34:43 +00:00
fr69400
d9e25c61bb
formAddObjectLine cant be overloaded by hook
2021-04-29 15:32:15 +02:00
kamel
4b490d434c
Corrections
2021-04-27 18:08:05 +02:00
kamel
80be0c32e4
Corrections
2021-04-27 14:13:59 +02:00
kamel
c645241327
Corrections
2021-04-27 12:11:28 +02:00
kamel
9c46b234cf
FIX Supplier invoices (deposit, multicurency in lines)
2021-04-26 17:43:27 +02:00
Laurent Destailleur
fd2d317b4a
Fix #yogosha5881
2021-04-25 15:55:36 +02:00
Alexandre SPANGARO
87cc1b2601
Add right supplier_invoice
2021-04-12 07:37:34 +02:00
Laurent Destailleur
6dc10bc87d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-04-07 12:19:39 +02:00
stickler-ci
30d26c1e28
Fixing style errors.
2021-04-06 07:20:07 +00:00
Alexandre SPANGARO
82b652df8a
NEW: Add deposit on supplier invoice (& somes ajustments)
2021-04-06 09:15:34 +02:00
Laurent Destailleur
ce1f8289a4
FIX #yogosha5746
2021-03-29 15:07:23 +02:00
Laurent Destailleur
d9108362ba
War against $_POST
2021-03-25 16:59:47 +01:00
Alexandre SPANGARO
f8703a0691
Translation "Generated documents"
2021-03-16 04:04:33 +01:00
Laurent Destailleur
f11a85a3e3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
htdocs/compta/facture/card.php
htdocs/contrat/card.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
2021-03-03 11:37:34 +01:00
Laurent Destailleur
7eb3e324c7
FIX #16503
2021-03-02 23:09:55 +01:00
Laurent Destailleur
42329b10c9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
build/generate_filelist_xml.php
htdocs/comm/propal/card.php
htdocs/commande/card.php
htdocs/compta/facture/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/modulebuilder.lib.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
htdocs/ticket/list.php
2021-03-02 15:27:20 +01:00
Laurent Destailleur
cffea1889f
FIX #16325
2021-03-02 01:17:28 +01:00
Frédéric FRANCE
8a782e1d4a
fix missing include
...
needed by dol_get_last_hour
2021-02-27 09:18:03 +01:00
Frédéric FRANCE
ed6d2376f1
code syntax fourn directory
2021-02-25 23:21:30 +01:00
Laurent Destailleur
bfe71e8509
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-17 14:28:19 +01:00
Laurent Destailleur
96a213ced7
Fix escaping html
2021-02-17 11:54:34 +01:00
Frédéric FRANCE
0da942210f
deprecate non camelCaps functions
2021-02-09 09:55:48 +01:00
Laurent Destailleur
f301635681
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
2021-02-03 21:02:32 +01:00
Laurent Destailleur
3b8b0d59ba
Merge pull request #16142 from OPEN-DSI/fix_erreur_facture_fourn
...
FIX: Select transport mode function when create a supplier invoice and add unique key to the table llx_c_transport_mode in migrate sql
2021-02-03 20:24:44 +01:00
Laurent Destailleur
348fd0fcb5
FIX #16160
2021-02-03 19:36:10 +01:00
kamel
506ba822e9
FIX: Select transport mode function when create a supplier invoice and add unique key to the table llx_c_transport_mode in migrate sql
2021-02-02 11:06:01 +01:00
Laurent Destailleur
b349290cd1
Fix test for date in future
2021-01-31 12:57:54 +01:00
Laurent Destailleur
7887d4cc8e
Fix price2num on all GETPOST('remise_percent')
2021-01-31 12:48:40 +01:00
Laurent Destailleur
2f69a380be
Fix syntax error
2021-01-16 16:06:49 +01:00
Laurent Destailleur
c7c74e8ed1
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/facture/card.php
2021-01-15 19:53:46 +01:00
Laurent Destailleur
7d37183f21
FIX Pb with VAT code when VAT code contains a number
2021-01-15 19:43:02 +01:00
Laurent Destailleur
828f1c8314
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
2021-01-15 14:04:22 +01:00
Laurent Destailleur
cac7fdd058
Look and feel v13
2021-01-15 14:02:18 +01:00
Laurent Destailleur
e2598f5af3
NEW Add check to avoid invoice date in future
2021-01-11 15:34:25 +01:00
Laurent Destailleur
5bd59cd6d1
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-11 13:37:59 +01:00
Laurent Destailleur
8debb58f7c
Fix rounding of currency unit prices
2021-01-11 13:36:53 +01:00
Laurent Destailleur
16253a79ee
FIX GETPOST of qty with wrong parameters
...
Conflicts:
htdocs/bom/bom_card.php
2021-01-11 13:11:40 +01:00
Laurent Destailleur
445a751d6b
Fix price2num
2021-01-11 13:08:02 +01:00
Laurent Destailleur
f3e28c2dd0
FIX GETPOST of qty with wrong parameters
2021-01-11 13:00:29 +01:00
Laurent Destailleur
7ba73f6c25
Fix price2num
2021-01-11 12:56:28 +01:00
Laurent Destailleur
26fa8b45ac
Merge pull request #15153 from FHenry/dev_new_add_desc_when_select_product
...
NEW: preload product description on selection for customer propal/order/invoice
2021-01-07 11:19:53 +01:00
Laurent Destailleur
b553dbb9d2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-06 20:23:07 +01:00
Laurent Destailleur
3d96c5a454
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/bom/tpl/objectline_create.tpl.php
htdocs/bom/tpl/objectline_edit.tpl.php
htdocs/bom/tpl/objectline_view.tpl.php
htdocs/core/boxes/box_shipments.php
htdocs/societe/class/societe.class.php
2021-01-06 20:20:37 +01:00
kevin
e8ba4de832
Fix #14353
2021-01-06 14:46:56 +01:00
Florian HENRY
dfaf77b03f
merge develop
2021-01-03 15:14:34 +01:00
Laurent Destailleur
1ab459e854
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-02 16:19:08 +01:00
Laurent Destailleur
ce0abd17fe
Debug v13
2021-01-02 16:18:16 +01:00
Laurent Destailleur
a6eb14f68b
Merge pull request #15585 from cfoellmann/fckeditor-notes
...
NEW Can toggle FCKeditor on public/private notes
2020-12-27 15:06:35 +01:00
Laurent Destailleur
b66ec5bc64
Fix css
2020-12-23 23:16:27 +01:00
Christian Foellmann
f801dd7d66
PR toggle FCKeditor on public/private notes
2020-11-30 16:39:14 +01:00
Laurent Destailleur
958893228a
Fix combo to add contact and status of contact on popup
2020-11-30 15:18:58 +01:00
Laurent Destailleur
6c65ebef0d
Look and feel v13
2020-11-29 15:16:53 +01:00
Givriz
dca4cf5987
Feature : ajout de la class "button-cancel"
...
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
Florian HENRY
46326d7659
merge from develop
2020-11-19 13:53:34 +01:00
Laurent Destailleur
da6c6c9e0a
Clean code
2020-11-08 14:39:20 +01:00
Scrutinizer Auto-Fixer
ab25e047c0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer
7f52920716
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Florian HENRY
d77a0b40a8
tested and approuve feaure #15036
2020-10-28 16:37:41 +01:00
Florian HENRY
a3073be8e4
Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product
2020-10-28 08:52:29 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end
2020-10-27 18:19:31 +01:00
Florian HENRY
967fae594e
Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product
2020-10-26 16:31:16 +01:00
Florian HENRY
76824c868b
clean get price for fourn and labal for supplier coducment
2020-10-26 16:31:07 +01:00
Frédéric FRANCE
1dab6570ed
Merge branch 'develop' into patch-11
2020-10-26 13:36:33 +01:00
Laurent Destailleur
82db2636f0
Fix phpcs
2020-10-26 13:22:03 +01:00
Frédéric FRANCE
f2c0e3765d
Update card.php
2020-10-25 23:29:51 +01:00
Laurent Destailleur
2638d4596a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/actions_sendmails.inc.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/facture/card.php
2020-10-25 21:33:13 +01:00
Laurent Destailleur
6bc0630c5f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/boxes/box_services_contracts.php
2020-10-25 21:09:43 +01:00
Laurent Destailleur
baa86d773b
Fix phpcs
2020-10-25 21:07:37 +01:00
Maxime Kohlhaas
680ae60b6f
Fix #15064 : error when supplier invoice numbering module is not configured
2020-10-25 08:56:34 +01:00
Laurent Destailleur
3bab0a322d
Merge pull request #15110 from frederic34/dol_fiche_head
...
replace deprecated
2020-10-23 04:03:46 +02:00
Laurent Destailleur
254da6923b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/line.php
2020-10-23 04:00:45 +02:00
Laurent Destailleur
0e25843baa
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2020-10-23 03:59:11 +02:00
Laurent Destailleur
62420c5e7b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/fourn/facture/card.php
2020-10-23 03:51:22 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated
2020-10-22 22:50:03 +02:00
Marc de Lima Lucio
594d9e321e
FIX: invoice payment terms edition: error management
2020-10-22 18:28:27 +02:00
Marc de Lima Lucio
1795ec6a9d
FIX: supplier invoice: autoatically calculate payment term when modifying payment condition
2020-10-22 16:11:12 +02:00
Laurent Destailleur
9cc8e6ac99
Fix intracommreport
2020-10-14 20:25:02 +02:00
Philippe GRAND
d66a1ac350
fix Call to undefined method Form::formTransportMode()
2020-10-13 10:05:44 +02:00
Alexandre SPANGARO
ca7ad35342
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-10-09 06:39:42 +02:00
Scrutinizer Auto-Fixer
1512521d91
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-07 13:01:28 +00:00
Laurent Destailleur
7b3a7c9921
Add token on all url with action=delete
2020-10-01 10:50:54 +02:00
Laurent Destailleur
c4b5f5a249
Maxi clean of code
2020-09-18 01:29:17 +02:00
Laurent Destailleur
970995d728
Clean code. Replace num_paiement with num_payment everywhere.
2020-09-14 01:03:51 +02:00
Laurent Destailleur
b8fe2188a6
Standardize code around model_pdf
2020-09-10 01:49:09 +02:00
Laurent Destailleur
661e3c7a11
Merge pull request #14576 from TobiasSekan/ShowBankOnlyWhenActive
...
FIX: Show bank account only when bank module is active (on invoices)
2020-09-03 13:19:32 +02:00
Sekan, Tobias
9c54f8831f
Show bank only when active (on new)
2020-08-28 13:08:04 +02:00
Sekan, Tobias
216e22e505
Show bank only when bank module is active
2020-08-28 12:53:30 +02:00
Laurent Destailleur
4ecd15b7ab
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/main.lang
2020-08-27 21:57:42 +02:00
Laurent Destailleur
243f59b9e9
FIX Missing transaction on PO actions
2020-08-26 17:09:45 +02:00
Alexandre SPANGARO
27c36713d3
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-08-16 22:10:02 +02:00
Alexandre SPANGARO
d1560c3e75
NEW: Introduce constant FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM
2020-07-30 21:10:06 +02:00
Laurent Destailleur
91a50038ff
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/fiche-stat.php
2020-07-27 19:35:34 +02:00
Laurent Destailleur
573feed66f
FIX locataxes lost on lines when cloning a vendor invoice
2020-07-25 02:59:49 +02:00
Alexandre SPANGARO
82c96a4f83
Fix SticklerCi
2020-07-06 04:47:27 +02:00
Alexandre SPANGARO
59ee22537d
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-07-06 03:24:27 +02:00
Laurent Destailleur
6d25b8630b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/prelevement.php
htdocs/core/class/rssparser.class.php
2020-06-23 11:38:20 +02:00
Laurent Destailleur
566c1aaf84
Fix for credit transfer module
2020-06-22 22:54:33 +02:00
Laurent Destailleur
90b5ed9908
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/website.lib.php
2020-06-11 23:41:35 +02:00
Laurent Destailleur
e087edf005
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formticket.class.php
htdocs/ticket/class/ticket.class.php
2020-06-11 23:39:26 +02:00
Regis Houssin
997cb214f1
FIX avoid error "Call to undefined function measuringUnitString()"
2020-06-11 16:52:24 +02:00
Laurent Destailleur
714d01bdab
Merge branch 'develop' into CleanupUserRightsForunFactureCard
2020-05-26 00:25:38 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule
2020-05-23 21:07:47 +02:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-23 18:34:58 +02:00
Tobias Sekan
babcdfc99a
Fix not working default value (re...)
2020-05-23 14:22:40 +02:00
Laurent Destailleur
7463eb2bd0
Merge pull request #13938 from TobiasSekan/FixDefaultDateValuesForInvoice
...
FIX not working default date values for new invoices
2020-05-23 14:21:50 +02:00
stickler-ci
2873f4dacf
Fixing style errors.
2020-05-22 06:08:12 +00:00
Tobias Sekan
d9a2d2b982
fix not working default values for payment
2020-05-22 08:00:26 +02:00
Frédéric FRANCE
b41ac00b98
add new rule
2020-05-21 15:05:19 +02:00
Tobias Sekan
44ffb8dbf7
Fix not working default value (re...)
2020-05-21 09:34:20 +02:00
Frédéric FRANCE
f5688b2eec
add new rule
2020-05-21 01:52:25 +02:00
Laurent Destailleur
1121d2c1c6
Look and feel v12
2020-04-25 13:49:44 +02:00
Laurent Destailleur
72c6ac1c72
Complete #13708 , normalization of code
2020-04-23 13:21:39 +02:00
Sekan, Tobias
06556fe14c
indent + comments
2020-04-21 12:25:44 +02:00
Sekan, Tobias
104e786a79
cleanup user rights on forun facture card
2020-04-21 10:02:18 +02:00
Scrutinizer Auto-Fixer
444c293c01
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Laurent Destailleur
4ff503d20a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/list.php
htdocs/supplier_proposal/list.php
2020-04-10 02:07:51 +02:00
Laurent Destailleur
7fe8c7eab3
FIX #11855
2020-04-10 01:37:04 +02:00
Laurent Destailleur
f3d35b5a19
Fix phpcs
2020-04-02 17:06:57 +02:00
Je2fb
fa32618fe9
Update card.php
...
If rate change is modify, the currency price is taken in place of the price from the main currency
2020-03-31 18:58:59 +02:00
Laurent Destailleur
4207d94f53
FIX Bad position of total in column
...
Conflicts:
htdocs/fourn/facture/paiement.php
2020-03-27 19:10:01 +01:00
Laurent Destailleur
a4797634d5
FIX Bad position of total in column
2020-03-27 19:08:39 +01:00
Laurent Destailleur
c27592bad2
Clean deprecated params on all fetch_optionals()
2020-03-27 16:02:58 +01:00
Laurent Destailleur
4841a5bf4a
Fix look and feel v11
2020-03-13 16:53:37 +01:00
Laurent Destailleur
c605b743e6
Fix look and feel v11
2020-03-13 16:52:00 +01:00
Laurent Destailleur
ec108162e3
Fix GETPOST
2020-02-25 15:14:37 +01:00
atm-ph
bb64d2d353
Fix create supplier invoice from supplier order don't keep source object as linked obkect
2020-02-18 16:00:12 +01:00
Alexandre SPANGARO
d6d3fff9dc
Merge branch 'develop' into 10.0_intracommreport
2020-02-03 21:15:07 +01:00
Laurent Destailleur
3a9e238dc6
FIX Missing value of $formconfirm as parameters of hook
2020-01-28 12:00:27 +01:00
Laurent Destailleur
ad7278e6a5
FIX Label of DEPOSIT on screen
...
Fix look and feel v11
2020-01-16 02:48:24 +01:00
Laurent Destailleur
607d013a9d
Fix phpcs
2020-01-01 23:01:42 +01:00
Laurent Destailleur
b50cb2a65d
Fix solution to solve a blocking situation (credit note both refunded
...
and consumed)
2020-01-01 19:04:14 +01:00
Laurent Destailleur
7d07c198bc
FIX Price of purchase order and vendor invoice with multicurrency
...
FIX entering predefined product with a forced unit price
2020-01-01 17:15:26 +01:00