Commit Graph

99615 Commits

Author SHA1 Message Date
Laurent Destailleur
32970b78ee
Merge pull request #17359 from FHenry/13.0
fix: add some .gitignore for module builder template
2021-04-27 01:30:43 +02:00
Laurent Destailleur
890c053deb
Merge pull request #17353 from dolibit-ut/patch-301
Update llx_20_c_departements.sql
2021-04-27 01:30:17 +02:00
Laurent Destailleur
a6fda78023
Merge pull request #17364 from Robin-Yann/13-company-disable-workflow
NEW Add option SOCIETE_DISABLE_WORKFORCE to hide staff field
2021-04-27 01:29:38 +02:00
Laurent Destailleur
9579533f4f
Merge pull request #17346 from dolibit-ut/patch-296
Update element.php
2021-04-27 01:23:59 +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
539954f760 Clean code 2021-04-27 01:12:40 +02:00
Laurent Destailleur
d2b91e934a Clean code 2021-04-27 01:09:46 +02:00
Laurent Destailleur
f54d14bfd6 Add method checkValForAPI to clean data from API input 2021-04-27 01:05:14 +02:00
Laurent Destailleur
29b1f2b58a Look and feel v14 2021-04-27 00:48:39 +02:00
Anthony Berton
e7242cb87f next 2021-04-27 00:23:59 +02:00
Anthony Berton
6353084777 init 2021-04-27 00:22:39 +02:00
Laurent Destailleur
5bfedbc248 Fix regression 2021-04-27 00:20:51 +02:00
Laurent Destailleur
bbcf206336
Merge pull request #17370 from cfoellmann/fix-bookmarks
NEW Make public bookmarks editable by admin users only
2021-04-27 00:13:25 +02:00
stickler-ci
1c1e111b0c Fixing style errors. 2021-04-26 22:06:11 +00:00
kastoras
8ba08552ca New/NEW Product Variants API, add variant stock to response
When acessing product variants via GET API /products/{id}/variants, Include stock_warehouse data to the response
2021-04-27 01:01:27 +03:00
Laurent Destailleur
fa1ad82663 Fix id in comment 2021-04-26 23:42:49 +02:00
Laurent Destailleur
566a9da56a
Merge pull request #17367 from dolibit-ut/patch-302
Update llx_10_c_regions.sql
2021-04-26 23:40:33 +02:00
Laurent Destailleur
5f4fe20756
Merge pull request #17371 from ksar-ksar/13.0
FIX #17363
2021-04-26 23:39:52 +02:00
Laurent Destailleur
d1fd26356f
Merge pull request #17377 from gmilad/gmilad-scayt-210423
NEW : Update doleditor.class.php for easily activate SCAYT
2021-04-26 23:38:23 +02:00
Laurent Destailleur
5a6d3b7c88
Merge pull request #17372 from marc-dll/FIX_11.0_invoice__generation_after_paiement
FIX: invoice PDF generation after payment
2021-04-26 22:49:56 +02:00
Laurent Destailleur
819a5bd0bd
Merge pull request #17373 from indelog/public_donationpaiement
Add : register donation payment when public payment
2021-04-26 22:46:48 +02:00
Laurent Destailleur
b96205d968
Merge pull request #17374 from Robin-Yann/13-fix-contact_filer-fournisseur
FIX List contact TAG filter fournisseur
2021-04-26 22:43:12 +02:00
Laurent Destailleur
3d5002b8f6
Update list.php 2021-04-26 22:42:40 +02:00
Laurent Destailleur
615f858ecb
Merge pull request #17384 from ibuiv/patch-5
Product Stock Card - add new standard Hooks
2021-04-26 22:40:38 +02:00
Laurent Destailleur
f0eef3a6de
Merge pull request #17375 from indelog/fix_adhpayextid
Fix : missig ext_payment_id on adh public pay
2021-04-26 22:40:15 +02:00
Laurent Destailleur
3d287dcd89
Merge pull request #17376 from indelog/fix_emptymail_adhnewpubform
Fix : empty email on public membership form
2021-04-26 21:22:43 +02:00
Laurent Destailleur
062dc28850
Merge pull request #17388 from aspangaro/14a30
NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD
2021-04-26 21:18:48 +02:00
Laurent Destailleur
8e67af8d58
Update api_products.class.php 2021-04-26 21:09:56 +02:00
Laurent Destailleur
fde4beb3b6
Merge pull request #17396 from atm-gauthier/fix_disable_delete_if_payments
FIX : We must not be able to delete sociale charge, vat or salary if there are payments
2021-04-26 21:08:29 +02:00
Laurent Destailleur
a29c26f299 Fix amount chosen lost 2021-04-26 21:07:46 +02:00
Laurent Destailleur
a24da7274b
Merge pull request #17399 from atm-jpb/fix_variant_default_vat_code
fix the productCombination class on updatePrice
2021-04-26 21:01:06 +02:00
Laurent Destailleur
f66c506011
Merge pull request #17381 from atm-lena/12.0_FormAttachOptions_AddHookParameters_Options
Add parameter "option" to hook formattachOptions
2021-04-26 21:00:12 +02:00
Antonin MARCHAL
a296f81bc6 lint(travis) 2021-04-26 20:30:21 +02:00
Antonin MARCHAL
c0b6dd92d7 lint(stickler)4th 2021-04-26 20:15:32 +02:00
Antonin MARCHAL
57118da206 lint(stickler)3rd 2021-04-26 20:13:55 +02:00
Antonin MARCHAL
285fa4a506 lint(stickler) again 2021-04-26 20:10:57 +02:00
Antonin MARCHAL
1d162cc62c lint(stickler) 2021-04-26 20:06:45 +02:00
Laurent Destailleur
8f7dd6211e fix css 2021-04-26 19:55:46 +02:00
Antonin MARCHAL
14269ab8ee Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2021-04-26 19:30:00 +02:00
Antonin MARCHAL
9e2ee5bf57 add(pmp) PMP per entity 2021-04-26 19:29:56 +02:00
Laurent Destailleur
c849ce79e9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-26 19:21:38 +02:00
Laurent Destailleur
b0fe08e411 Clean code 2021-04-26 19:21:23 +02:00
Laurent Destailleur
d138e7410b Clean code 2021-04-26 19:12:23 +02:00
kamel
9f3bcbc39d Fix Stickler CI 2021-04-26 17:48:42 +02:00
kamel
9c46b234cf FIX Supplier invoices (deposit, multicurency in lines) 2021-04-26 17:43:27 +02:00
stickler-ci
a8136a00b1 Fixing style errors. 2021-04-26 15:07:41 +00:00
jpb
8d07b43ccd space stickler 2021-04-26 17:05:21 +02:00
jpb
09d68dd7a6 fix the productCombination class on updatePrice 2021-04-26 17:00:53 +02:00
lmarcouiller
080bd90c93 Fix #17219 : complement of PR 17161 2021-04-26 16:15:09 +02:00