Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
89,109 Commits 35 Branches 179 Tags 1.7 GiB
9165ea9e67
Commit Graph

78410 Commits

Author SHA1 Message Date
Laurent Destailleur
02e07c13c8
Merge branch 'develop' into patch-8 2020-09-04 23:11:00 +02:00
Laurent Destailleur
263989019c
Merge pull request #14493 from aspangaro/13a4 
NEW Accountancy - Add options to disable accounting on sales, purchases & expense reports
 2020-09-04 23:10:15 +02:00
Laurent Destailleur
f04b5c48ea
Update accountancy.lang 2020-09-04 23:09:34 +02:00
Cédric
c5fda967c7
add field ref_ext in llx_facturedet 2020-09-04 22:57:21 +02:00
Laurent Destailleur
7e879a8012 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-04 22:44:49 +02:00
Laurent Destailleur
a2db403abe Fix phpcs 2020-09-04 22:44:31 +02:00
Laurent Destailleur
b2c20c3dfd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-04 22:42:48 +02:00
Laurent Destailleur
451c878cfc Fix add missing field 2020-09-04 22:42:37 +02:00
Laurent Destailleur
fba0fd0bed
Merge pull request #14641 from c3do/patch-9 
NEW ref_ext field for Commande lines
 2020-09-04 22:41:24 +02:00
Laurent Destailleur
ca29cc0c77
Merge pull request #14632 from OPEN-DSI/new-ticket-type-severity-group-translated-labels 
NEW translate classification labels in ticket
 2020-09-04 22:39:12 +02:00
Laurent Destailleur
9803da3ac1
Merge pull request #14637 from bafbes/abb120138 
fix : unuseful truncation of list name elements
 2020-09-04 22:38:08 +02:00
Laurent Destailleur
7cc1e30748
Merge pull request #14638 from OPEN-DSI/new-ticket-public-mail-format 
NEW format tickets sent by mail in public interface
 2020-09-04 22:37:18 +02:00
stickler-ci
ebb69e9d6e Fixing style errors. 2020-09-04 19:38:49 +00:00
Cédric
e9d6e04c25
NEW field ref_ext in llx_commandedet 2020-09-04 21:36:01 +02:00
Cédric
e84a2ab07c
Fix addline commande.class.php 2020-09-04 21:26:57 +02:00
Cédric
c06cb1eff3
NEW ref_ext for order lines 2020-09-04 21:25:20 +02:00
Cédric
1f82fcc1f0
NEW ref_ext field for order lines 2020-09-04 21:11:58 +02:00
Alexandre SPANGARO
247cc71ef4 Merge remote-tracking branch 'upstream/develop' into 13a8 2020-09-04 20:26:05 +02:00
Laurent Destailleur
c8da9f97a8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2020-09-04 19:51:22 +02:00
Laurent Destailleur
2e7f588cac FIX using decimal on stock correction 
Conflicts:
	htdocs/product/stock/product.php
 2020-09-04 19:38:56 +02:00
Cédric
38bc98cf7d
ADD ref_ext field in llx_facturedet 2020-09-04 19:38:24 +02:00
Laurent Destailleur
0c1a5d9e25 FIX using decimal on stock correction 2020-09-04 19:34:20 +02:00
stickler-ci
1cff5e0e03 Fixing style errors. 2020-09-04 17:33:58 +00:00
Cédric
5f4ad2a9fa
NEW ref_ext for Facture lines 2020-09-04 19:32:42 +02:00
Cédric
b60f82966c
Update facture.class.php 2020-09-04 17:54:25 +02:00
lvessiller
123d33b47c NEW format tickets sent by mail in public interface 2020-09-04 17:50:49 +02:00
bahfir abbes
77afbd4412 fix : unuseful truncation of list name elements 2020-09-04 15:58:21 +01:00
Laurent Destailleur
4fdbfa8224 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-04 16:30:55 +02:00
Laurent Destailleur
2e609d448c Fix error message 2020-09-04 16:30:34 +02:00
Laurent Destailleur
7094cec42a Fix use same duration code 'on 1 letter' than the production duration 
record, also than tha sprintf.
 2020-09-04 14:37:55 +02:00
lvessiller
4f68c694b8 NEW fetch object useless on create ticket trigger 2020-09-04 14:25:13 +02:00
Laurent Destailleur
f2a16d860e Enhance method fetchByFkProductChild() 2020-09-04 14:05:35 +02:00
Laurent Destailleur
0ee40402b9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-04 13:35:31 +02:00
Laurent Destailleur
092b66a7f1 Add variation_ref_ext field 2020-09-04 13:35:16 +02:00
Laurent Destailleur
aa031606b9
Merge pull request #14635 from c3do/patch-7 
NEW endpoint getContacts and Clean results
 2020-09-04 13:25:36 +02:00
Laurent Destailleur
e21b3f6681 FIX bad route url to delete subproduct with API 2020-09-04 13:23:11 +02:00
Laurent Destailleur
1ceb7c8677 Add ref_ext to product_attribute. 2020-09-04 12:41:56 +02:00
Cédric
9141b6b092
NEW endpoint getContacts and Clean results 
NEW Get contacts list of a given order
FIX bad function used to unlink a contact
FIX Result for link contact and unlink contact
 2020-09-04 12:36:03 +02:00
Laurent Destailleur
6eb1be02ad
Merge pull request #14630 from OPEN-DSI/new-ticket-card-extrafields-errors 
NEW manage errors on update extra fields in ticket card
 2020-09-04 12:27:25 +02:00
Laurent Destailleur
257bb87c53 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-04 12:25:32 +02:00
Laurent Destailleur
07fc85c222 Fix minor 2020-09-04 12:25:16 +02:00
lvessiller
85575fd604 NEW translate classification labels in ticket 2020-09-04 12:18:32 +02:00
Laurent Destailleur
ef0c9df5ff
Merge pull request #14224 from cfoellmann/disable-eatby-sellby 
NEW Can hide eatby, sellby dates with option PRODUCT_DISABLE_SELLBY and PRODUCT_DISABLE_EATBY
 2020-09-04 12:09:30 +02:00
Laurent Destailleur
564a47e41c
Update productlot_list.php 2020-09-04 12:08:10 +02:00
lvessiller
eb83941e61 NEW manage errors on update extra fields in ticket card 2020-09-04 10:46:05 +02:00
lvessiller
22d4382b83 NEW add extra fields labels and values in mail on create ticket 2020-09-04 09:38:33 +02:00
Laurent Destailleur
1408c862f6 css 2020-09-03 21:23:58 +02:00
Laurent Destailleur
614c188486 css 2020-09-03 19:29:00 +02:00
Laurent Destailleur
aafe323405 css 2020-09-03 19:11:56 +02:00
Laurent Destailleur
3f243aa457
Merge pull request #14622 from kev-73/develop 
NEW: add week number for month view in agenda
 2020-09-03 19:02:59 +02:00
Laurent Destailleur
6ecd566697
Merge pull request #14624 from OPEN-DSI/new-ticket-create-send-trackid-and-context 
NEW send context and remove new lines on create ticket
 2020-09-03 18:58:50 +02:00
Laurent Destailleur
a87797ed66 Debug recruitment module 2020-09-03 18:52:09 +02:00
lvessiller
a4f1ddaad0 NEW send context and remove new lines on create ticket 2020-09-03 17:22:27 +02:00
Laurent Destailleur
3ea9266732 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-03 15:29:14 +02:00
Laurent Destailleur
9a232b6164 Fix menu 2020-09-03 15:29:00 +02:00
stickler-ci
43590587e5 Fixing style errors. 2020-09-03 12:30:04 +00:00
Adrien Raze
bcd9a0b29f Retours PR 2020-09-03 14:25:17 +02:00
kev-73
38ed033b8a
New: add week number for month view in agenda 
Agenda, view by month : add a column on left side of agenda, which containt the week number for each line, so for each week. Column width at 2%, no change for width of others columns, because with 14% by defalut, so 14*7=98, the 2% for new column is available. For get date and week number, use fonctions and variables already define in file.
 2020-09-03 14:03:40 +02:00
Laurent Destailleur
457342ee95
Merge pull request #14541 from TobiasSekan/FixSinglePayWithMultiOnPaymentForun 
FIX non-numeric value on multicurrency payment (part 2)
 2020-09-03 13:26:43 +02:00
Laurent Destailleur
f7f42f7680 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-03 13:19:53 +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
Laurent Destailleur
fe6d42f9e2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-03 12:56:34 +02:00
Laurent Destailleur
ac8c6954bf
Merge pull request #14607 from aspangaro/13a9 
New Accountancy - Balance - Move to getNomUrl on accounting account
 2020-09-03 12:44:31 +02:00
Laurent Destailleur
2fe9000286
Merge pull request #14612 from atm-john/develop_fix_and_factor_price_level 
Fix and factor fetch combination price level
 2020-09-03 12:39:06 +02:00
Laurent Destailleur
9293d1917a
Update ProductCombination.class.php 2020-09-03 12:37:30 +02:00
Laurent Destailleur
1d3c54dd64
Update ProductCombination.class.php 2020-09-03 12:36:57 +02:00
Laurent Destailleur
4da10b5f63
Merge pull request #14614 from aspangaro/13a10 
New Accountancy Add predefined url in getNomUrl
 2020-09-03 12:34:24 +02:00
Laurent Destailleur
87113a77b4
Update accountingaccount.class.php 2020-09-03 12:32:51 +02:00
Laurent Destailleur
67e58f639f
Merge pull request #14615 from atm-lena/FIX_selectModelMailFunction 
selectModelMail() : if default and no mail models select default model
 2020-09-03 12:29:59 +02:00
Laurent Destailleur
f88d2bdbbf
Merge pull request #14618 from TobiasSekan/ShowNumAndClickWarehouseArea 
NEW Show header number and make it clickable in warehouse area
 2020-09-03 12:23:45 +02:00
Laurent Destailleur
03d0ccc1cc
Merge pull request #14621 from TobiasSekan/ShowNumAndClickOnPaymentArea 
NEW Show header number and make it clickable on payment area
 2020-09-03 12:20:38 +02:00
Laurent Destailleur
1a33cd91c9
Update index.php 2020-09-03 12:20:20 +02:00
stickler-ci
06e8e62d38 Fixing style errors. 2020-09-03 09:49:35 +00:00
Sekan, Tobias
8f37f66470 Show number and allow click on payment area 2020-09-03 11:36:11 +02:00
Laurent Destailleur
77d15c9382 Fix long name overlap date 2020-09-03 11:34:20 +02:00
Laurent Destailleur
5af1eff2d9 Fix phpcs 2020-09-03 10:46:46 +02:00
Sekan, Tobias
38da331a8b Show number and clickable on warehouse area 2020-09-03 10:41:42 +02:00
stickler-ci
8c514c8025 Fixing style errors. 2020-09-03 08:24:12 +00:00
Adrien Raze
c043501ee5 Retours PR standard 2020-09-03 10:19:57 +02:00
Adrien Raze
0898a1e28a Merge branch 'NEW_propal_massAction_validate_sign' of https://github.com/atm-adrien/dolibarr into NEW_propal_massAction_validate_sign 2020-09-03 10:06:13 +02:00
Adrien Raze
675fe05808 Retours PR Standard 2020-09-03 09:51:49 +02:00
atm-lena
197d03f9d9 FIX selectModelMail() : if default and no mail models select default model 2020-09-03 09:23:10 +02:00
Alexandre SPANGARO
b3cd9688d5 Typo 2020-09-02 23:43:47 +02:00
Alexandre SPANGARO
853bacd545 New Accountancy Add predefined url in getNomUrl 2020-09-02 23:43:36 +02:00
Laurent Destailleur
31548c6fbb Better error message 2020-09-02 21:42:29 +02:00
Laurent Destailleur
f642fc9ad9 Fix 2020-09-02 21:40:17 +02:00
Laurent Destailleur
ed743c9dbb Fix phpcs 
More secured sendEmailsReminder()
 2020-09-02 21:39:22 +02:00
Laurent Destailleur
9868140693 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-02 19:20:12 +02:00
Laurent Destailleur
4dca1929e0 Can close a recruitment job 2020-09-02 19:19:47 +02:00
Laurent Destailleur
80f824569a Use english 2020-09-02 19:15:03 +02:00
Laurent Destailleur
a58dcc3886 Doc 2020-09-02 19:10:07 +02:00
Laurent Destailleur
a984c8e969 Use english 2020-09-02 18:57:56 +02:00
Laurent Destailleur
0572d2e46d
Merge pull request #14385 from egils-consulting/translate-variable-name-and-add-hints 
Update api_supplier_invoices.class.php
 2020-09-02 18:22:50 +02:00
Laurent Destailleur
ab938f2299
Merge pull request #14606 from bafbes/abb120137 
new : option to hide complementary actions on member subscription
 2020-09-02 18:10:30 +02:00
Laurent Destailleur
6ccec31fa0
Merge pull request #14605 from Tim-Otte/fix-contact-type-translation 
FIX: Contact type translation
 2020-09-02 18:09:37 +02:00
Laurent Destailleur
6d52721246
Merge pull request #14609 from atm-lena/NEW_AddDefaultMailModelToSelect_EventReminder 
Event Reminder : Add "Default Mail Model" to select Mail Model
 2020-09-02 18:08:40 +02:00
Laurent Destailleur
de3e818ccf
Update html.form.class.php 2020-09-02 18:08:08 +02:00
Laurent Destailleur
31acaf4b4b
Merge pull request #14610 from OPEN-DSI/new-ticket-mail-smtp-config 
NEW can set a dedicated SMTP config for sending email from public ticket interface
 2020-09-02 18:06:37 +02:00
Laurent Destailleur
d913736bd1
Update list.php 2020-09-02 17:59:21 +02:00
Laurent Destailleur
ee003ed499
Update list.php 2020-09-02 17:57:09 +02:00