Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unizone mobile app #42422

Closed
wants to merge 3,626 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3626 commits
Select commit Hold shift + click to select a range
e69bff0
fix: Auto Insert Item Price If Missing when discount & blank UOM (bac…
mergify[bot] Jun 7, 2022
dfbfe40
fix: Depreciate Asset before generating GL Entries on sale (#30759)
GangaManoj Jun 8, 2022
7696ae4
fix(india): e-invoice eligibility if company gstin is not configured …
nextchamp-saqib Jun 8, 2022
c7accb9
test: Util to update cost in all BOMs
marination Jun 7, 2022
b529a61
test: Fix `test_update_bom_cost_in_all_boms`
marination Jun 7, 2022
289d65a
chore: `get_valuation_rate` sider fixes
marination Jun 8, 2022
8656020
Merge branch 'version-13-hotfix' into v13-perf-bom-update-tool
marination Jun 8, 2022
8a4c9d1
fix(asset): failing test case (#31277)
nextchamp-saqib Jun 8, 2022
e1fe901
Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr…
nextchamp-saqib Jun 8, 2022
633a452
fix: Use `frappe.as_unicode` to decode output of redis module list (b…
mergify[bot] Jun 8, 2022
7a868a4
Merge branch 'version-13-hotfix' into v13-perf-bom-update-tool
marination Jun 9, 2022
5a08850
chore: Less hacky tests, versioning (replace bom) and clearing log da…
marination Jun 9, 2022
9f6b32a
fix(ux): hide new version btn on unsaved BOM (backport #31297) (#31298)
mergify[bot] Jun 9, 2022
81e32e2
fix: misaligned columns in print format of AR/AP report
ruthra-kumar Jun 9, 2022
9347cbb
chore: Asset Arabic translation Fix (#31221)
meaziz Jun 9, 2022
3816ae2
Merge pull request #31078 from marination/v13-perf-bom-update-tool
marination Jun 9, 2022
48de5ab
Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr…
marination Jun 9, 2022
bb431bb
Merge pull request #31299 from frappe/mergify/bp/version-13-hotfix/pr…
marination Jun 9, 2022
77e4755
fix: update ru translate (backport #31200) (#31304)
mergify[bot] Jun 9, 2022
fb9b302
fix: Reset represents company on disabling internal customer and supp…
mergify[bot] Jun 9, 2022
00371f4
fix: Trial Balance failing to ignore Finance Book
sunhoww Jun 1, 2022
44642db
chore: Linting Issues
deepeshgarg007 Jun 9, 2022
894f945
fix: typo in sql condition
sunhoww Jun 9, 2022
384ce92
Merge pull request #31307 from frappe/mergify/bp/version-13-hotfix/pr…
deepeshgarg007 Jun 9, 2022
e5d2c59
fix(India): Incorrect taxable in GSTR-3B report
deepeshgarg007 Jun 9, 2022
176a672
chore: cleanup
deepeshgarg007 Jun 9, 2022
95f8784
chore: Resolve conflicts
deepeshgarg007 Jun 10, 2022
391ed9c
fix: locale Currency and Float setting in update_employee
RJPvT Jun 8, 2022
4c9422f
chore: resolve conflicts
deepeshgarg007 Jun 10, 2022
309bdf2
Merge pull request #31139 from frappe/mergify/bp/version-13-hotfix/pr…
deepeshgarg007 Jun 10, 2022
1aaca09
chore: Linting Issues
deepeshgarg007 Jun 10, 2022
9e0cb2a
Merge pull request #31262 from frappe/mergify/bp/version-13-hotfix/pr…
deepeshgarg007 Jun 10, 2022
395f86f
Merge pull request #31310 from frappe/mergify/bp/version-13-hotfix/pr…
deepeshgarg007 Jun 10, 2022
5ebbe81
fix: update Period Closing Voucher per Company
zeta17 Jun 10, 2022
50a4c2e
refactor: remove add_fetch (backport #31315) (#31319)
mergify[bot] Jun 10, 2022
977d696
Merge pull request #31318 from frappe/mergify/bp/version-13-hotfix/pr…
deepeshgarg007 Jun 11, 2022
78473b8
fix(UX): use doc.status for Job Card status (#31320)
ankush Jun 10, 2022
ff770bb
Merge pull request #31321 from frappe/mergify/bp/version-13-hotfix/pr…
marination Jun 13, 2022
1e6e652
Merge pull request #31314 from frappe/mergify/bp/version-13-hotfix/pr…
marination Jun 13, 2022
5d0f271
fix: update fr translation (backport #31232) (#31334)
mergify[bot] Jun 13, 2022
fb1325d
Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr…
nextchamp-saqib Jun 13, 2022
79b2062
fix: Supplied Qty not updated on Stock Entry cancel
marination Jun 13, 2022
86a0ba5
test: PO Supplied Qty reset on cancel/submit
marination Jun 13, 2022
6064ca6
test: Pass "yes" instead of 1 for `is_subcontracted` in `create_purch…
marination Jun 13, 2022
c5bda9c
Merge pull request #31344 from frappe/mergify/bp/version-13-hotfix/pr…
marination Jun 13, 2022
d375939
fix: Company address filter in quotation
deepeshgarg007 Jun 10, 2022
a1ba847
fix(India): Sales taxes and charges template fetching in quotation
deepeshgarg007 Jun 10, 2022
37ba550
fix: Partially Ordered status for quotation
deepeshgarg007 Jun 11, 2022
823cf88
chore: linting issues
deepeshgarg007 Jun 14, 2022
da1a948
chore: resolve conflicts
deepeshgarg007 Jun 14, 2022
55e0c03
Merge pull request #31347 from frappe/mergify/bp/version-13-hotfix/pr…
deepeshgarg007 Jun 14, 2022
662a63b
Merge pull request #31349 from frappe/version-13-hotfix
deepeshgarg007 Jun 14, 2022
943d83b
chore(release): Bumped to Version 13.34.0
frappe-bot Jun 14, 2022
ebcdaf7
fix: Spelling mistake in quotation depend on (backport #31362) (#31363)
mergify[bot] Jun 15, 2022
7c35887
fix: Pick Template BOM if variant BOM absent in WO popup from SO
marination Jun 14, 2022
001130c
Merge pull request #31368 from frappe/mergify/bp/version-13-hotfix/pr…
marination Jun 15, 2022
f19ed0b
perf: GLE reposting with progress and chunking (backport #31343) (#31…
ankush Jun 15, 2022
2cd0319
chore: Fix a potential variable misuse bug (#31372)
LostBenjamin Jun 16, 2022
0f3a02d
fix: Merge Conflicts
marination Jun 16, 2022
2d6e518
Merge pull request #31380 from frappe/mergify/bp/version-13-hotfix/pr…
marination Jun 16, 2022
4e2ed6f
fix: transaction date gets unset in material request (#31387)
mergify[bot] Jun 17, 2022
051e5cd
fix: UOM handling for transaction without item (backport #31389) (#31…
mergify[bot] Jun 17, 2022
642b9c5
fix: Respect system precision for user facing balance qty values (#30…
marination Jun 17, 2022
3b9f943
fix: Quotation lost update
deepeshgarg007 Jun 17, 2022
8d63abb
chore: fix condition
deepeshgarg007 Jun 17, 2022
b3169ed
Merge pull request #31275 from frappe/mergify/bp/version-13-hotfix/pr…
deepeshgarg007 Jun 17, 2022
8e2e61e
chore: resolve conflicts
deepeshgarg007 Jun 18, 2022
5bcfbbe
chore: fix merge conflict
marination Jun 20, 2022
e982abb
chore: Change autoname to v13 compatible value (#31407)
marination Jun 20, 2022
70a7dfe
chore: Missing import `flt`
marination Jun 20, 2022
4186aaf
fix: Conversion rate validation for multi-currency invoices
deepeshgarg007 Jun 14, 2022
da70b69
test: Add test case
deepeshgarg007 Jun 20, 2022
760ba08
Merge pull request #31411 from frappe/mergify/bp/version-13-hotfix/pr…
deepeshgarg007 Jun 21, 2022
8b3fc15
Merge pull request #31397 from frappe/mergify/bp/version-13-hotfix/pr…
deepeshgarg007 Jun 21, 2022
3f4d00d
Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr…
marination Jun 21, 2022
8a4cd2a
fix: internal transfer GLE validation
ankush Jun 7, 2022
e43e442
Merge pull request #31413 from frappe/mergify/bp/version-13-hotfix/pr…
deepeshgarg007 Jun 21, 2022
d6d2215
Merge pull request #31414 from frappe/version-13-hotfix
ankush Jun 21, 2022
0a25d28
chore(release): Bumped to Version 13.34.1
frappe-bot Jun 21, 2022
1e34616
Merge pull request #31393 from frappe/mergify/bp/version-13-hotfix/pr…
marination Jun 21, 2022
8b78a12
fix: update ru translate (backport #31404) (#31417)
mergify[bot] Jun 21, 2022
736f206
fix: translation for filter status on report
HarryPaulo Jun 21, 2022
fcec318
chore: Clear Progress section for completed logs & `on_submit` UX
marination Jun 20, 2022
b4e64d0
Merge pull request #31423 from marination/bom-update-log-cleanup-perf…
marination Jun 22, 2022
87f7781
Merge pull request #31422 from frappe/mergify/bp/version-13-hotfix/pr…
marination Jun 22, 2022
4b53ec2
Update bank_clearance_summary.py
nihantra Jun 17, 2022
abfe926
fix(Salary Slip): Components not updated when amount evaluates to 0 d…
ruchamahabal Jun 23, 2022
d1bb94b
Merge pull request #31431 from frappe/mergify/bp/version-13-hotfix/pr…
deepeshgarg007 Jun 23, 2022
559bde3
fix: add UOM validation for planned-qty
s-aga-r Jun 22, 2022
5f8d8c0
Merge pull request #31440 from frappe/mergify/bp/version-13-hotfix/pr…
marination Jun 24, 2022
e7659a1
fix: Monthly depreciation using WDV method
nabinhait Jun 24, 2022
a0c5c73
fix: General Ledger and TB opening entries mismatch issues
deepeshgarg007 Jun 23, 2022
873d1ec
Merge pull request #31447 from frappe/mergify/bp/version-13-hotfix/pr…
deepeshgarg007 Jun 27, 2022
2219132
fix: Quotation and Sales Order item sync
deepeshgarg007 Jun 24, 2022
5e7cad4
refactor: clean up product bundle client side code (backport #31455) …
mergify[bot] Jun 27, 2022
8ab65bc
Merge pull request #31453 from frappe/mergify/bp/version-13-hotfix/pr…
deepeshgarg007 Jun 28, 2022
8155306
fix: dont update RM items table if not required (backport #31408) (#3…
mergify[bot] Jun 28, 2022
0d5bb92
Merge pull request #31464 from frappe/version-13-hotfix
deepeshgarg007 Jun 28, 2022
43cb4fc
chore(release): Bumped to Version 13.34.2
frappe-bot Jun 28, 2022
ed0500d
base code change in PR and PO
PITPL-Akshay-Prajapati Jul 4, 2022
39a69af
json changes in po and pr
PITPL-Akshay-Prajapati Jul 4, 2022
280f895
Customization Module
PITPL-Gayatri-Gajjjar Jul 8, 2022
b92831e
customer selling price add update
PITPL-Kaushal-Khute Jul 8, 2022
87d610d
exp date and mfg date validation in batch form
PITPL-Kaushal-Khute Jul 8, 2022
caae3d9
Merge pull request #2 from pseudocode-skyai/kaushal-erp-bugfix
PITPL-Akshay-Prajapati Jul 11, 2022
d63609c
Import file is not unnecessary remove it ,remove unnecessary blank l…
PITPL-Kaushal-Khute Jul 12, 2022
6e60c53
Merge pull request #3 from pseudocode-skyai/gayatri_erp_customization
PITPL-Akshay-Prajapati Jul 12, 2022
7cde912
Customization in po, po item , pr , pr item , supplier tables
PITPL-Gayatri-Gajjjar Jul 12, 2022
fbb3253
Customization in Item module.
PITPL-Kaushal-Khute Jul 12, 2022
5ca5281
Merge branch 'gayatri_erp_customization' of https://github.com/pseudo…
PITPL-Kaushal-Khute Jul 12, 2022
3b66dc7
Customization Item and Payment terms template details
PITPL-Kaushal-Khute Jul 13, 2022
c0f7944
Customization customer and batch module.
PITPL-Gayatri-Gajjjar Jul 13, 2022
1feeaa0
Merge branch 'gayatri_erp_customization' of https://github.com/pseudo…
PITPL-Gayatri-Gajjjar Jul 13, 2022
e06fb9d
Merge pull request #5 from pseudocode-skyai/gayatri_erp_customization
PITPL-Akshay-Prajapati Jul 13, 2022
1ecb256
Merge pull request #6 from pseudocode-skyai/kaushal-erp-bugfix
PITPL-Akshay-Prajapati Jul 13, 2022
aad4f96
PO PR customize change
PITPL-Kaushal-Khute Jul 13, 2022
b3058d1
Remove row when remove product code in item table
PITPL-Kaushal-Khute Jul 14, 2022
381f596
Customization PO and PR
PITPL-Gayatri-Gajjjar Jul 14, 2022
8d11463
Delete items total and qty update in PO and PR
PITPL-Kaushal-Khute Jul 14, 2022
0e530b5
Merge branch 'unizone-migration' into gayatri_erp_customization
PITPL-Akshay-Prajapati Jul 14, 2022
1185c6e
Remove Console log PO and PR
PITPL-Kaushal-Khute Jul 14, 2022
c8c634a
Merge pull request #9 from pseudocode-skyai/Po_PR_Total_quantity_Clear
PITPL-Akshay-Prajapati Jul 14, 2022
d7ea909
Merge pull request #7 from pseudocode-skyai/PO_PR_table_clear_all
PITPL-Akshay-Prajapati Jul 14, 2022
99ceb5c
Merge pull request #8 from pseudocode-skyai/gayatri_erp_customization
PITPL-Akshay-Prajapati Jul 14, 2022
f96146f
Hide Drop ship and section_break_3
PITPL-Gayatri-Gajjjar Jul 14, 2022
06890e6
Set Listview in PO and PR
PITPL-Gayatri-Gajjjar Jul 14, 2022
b73e166
Slove conflict in supplier
PITPL-Gayatri-Gajjjar Jul 14, 2022
09e05a2
Merge pull request #10 from pseudocode-skyai/gayatri_erp_customization
PITPL-Akshay-Prajapati Jul 14, 2022
8f7c2e3
Customize Supplier
PITPL-Kaushal-Khute Jul 15, 2022
483a412
Change Contact Number field name
PITPL-Kaushal-Khute Jul 15, 2022
2a1c143
supplier json remove fixture and added form data
PITPL-Kaushal-Khute Jul 15, 2022
48fdabf
Remove Filed in Customization form and add Doctype in Item Module
PITPL-Gayatri-Gajjjar Jul 15, 2022
0becbcf
Contact Number change the section
PITPL-Kaushal-Khute Jul 15, 2022
a4f619e
Remove Filed in Customization form and Add Doctype in Purchase receip…
PITPL-Gayatri-Gajjjar Jul 15, 2022
80bfd02
Customize Purchase Order
PITPL-Kaushal-Khute Jul 15, 2022
56d6beb
Customize Customer
PITPL-Kaushal-Khute Jul 15, 2022
56dc765
Merge pull request #16 from pseudocode-skyai/customize_customer
PITPL-Akshay-Prajapati Jul 18, 2022
dee7c12
Merge pull request #12 from pseudocode-skyai/product_customization
PITPL-Akshay-Prajapati Jul 18, 2022
6db430c
Merge pull request #15 from pseudocode-skyai/customize_purchase_order
PITPL-Akshay-Prajapati Jul 18, 2022
fd69577
Merge pull request #14 from pseudocode-skyai/pr_form_customize
PITPL-Akshay-Prajapati Jul 18, 2022
12a58b1
Merge branch 'unizone-migration' into customization_supplier
PITPL-Akshay-Prajapati Jul 18, 2022
a3f1981
Merge pull request #13 from pseudocode-skyai/customization_supplier
PITPL-Akshay-Prajapati Jul 18, 2022
2db18b3
Customization In PR , customer , PRI and Item Price tables.,
PITPL-Gayatri-Gajjjar Jul 18, 2022
90ad839
Merge pull request #17 from pseudocode-skyai/cutomize_erpnext
PITPL-Akshay-Prajapati Jul 18, 2022
e827762
Change module name in pseducode to stock
PITPL-Gayatri-Gajjjar Jul 19, 2022
aada9b1
Fetch manufacturing_date,expiry_date depends on Batch
PITPL-Gayatri-Gajjjar Jul 19, 2022
11ae1f1
Hide Scan Barcode field in Purchase Receipt
PITPL-Gayatri-Gajjjar Jul 19, 2022
8949db1
Merge pull request #18 from pseudocode-skyai/customize_erpnext_module
PITPL-Akshay-Prajapati Jul 19, 2022
5a53339
Merge pull request #20 from pseudocode-skyai/customize_field_pr
PITPL-Akshay-Prajapati Jul 19, 2022
b344900
Merge pull request #19 from pseudocode-skyai/Fetch_date_batch
PITPL-Akshay-Prajapati Jul 19, 2022
e24c723
Fetch Label Field dependas on Batch
PITPL-Gayatri-Gajjjar Jul 20, 2022
80ec7f6
change commnet msg
PITPL-Gayatri-Gajjjar Jul 20, 2022
3c07dd7
Merge pull request #22 from pseudocode-skyai/fatch_lable_field
PITPL-Akshay-Prajapati Jul 20, 2022
cc2d8ec
Unhide price list section in item price
PITPL-Gayatri-Gajjjar Jul 20, 2022
fb54561
Merge pull request #23 from pseudocode-skyai/customze_item_price
PITPL-Akshay-Prajapati Jul 22, 2022
4953e80
Add supplier field in listview.
PITPL-Gayatri-Gajjjar Jul 22, 2022
f7de0e3
Hide unnecessary fields
PITPL-Gayatri-Gajjjar Jul 22, 2022
de51ffe
Merge pull request #24 from pseudocode-skyai/add_listview_supplier
PITPL-Akshay-Prajapati Jul 22, 2022
2940e7e
Merge pull request #25 from pseudocode-skyai/customize_doctype
PITPL-Akshay-Prajapati Jul 25, 2022
a4b83cf
Bug Fix related stoc items
PITPL-Gayatri-Gajjjar Jul 25, 2022
d024105
Merge branch 'unizone-migration' of https://github.com/pseudocode-sky…
PITPL-Gayatri-Gajjjar Jul 25, 2022
9c34b22
Slove syntext error
PITPL-Gayatri-Gajjjar Jul 25, 2022
90ecc6c
Change the label field in product price table.
PITPL-Gayatri-Gajjjar Jul 27, 2022
0991357
Create new batch in purchase receipt
PITPL-Kaushal-Khute Jul 28, 2022
42367c8
Modify manufacturing date and expiry date
PITPL-Kaushal-Khute Jul 28, 2022
d250bd9
Create new Batch
PITPL-Kaushal-Khute Jul 29, 2022
4d5503c
Batch number hide
PITPL-Kaushal-Khute Jul 29, 2022
a4a110d
Merge pull request #27 from pseudocode-skyai/label_change
PITPL-Akshay-Prajapati Jul 29, 2022
b5725a9
Remove unwanted code and space
PITPL-Kaushal-Khute Aug 1, 2022
21bbbdc
Remove unwanted space
PITPL-Kaushal-Khute Aug 1, 2022
12117d1
Remove space
PITPL-Kaushal-Khute Aug 1, 2022
77b0f7b
Merge pull request #30 from pseudocode-skyai/create_batch_PR
PITPL-Akshay-Prajapati Aug 1, 2022
7fcff72
PO and PR cancellation
PITPL-Kaushal-Khute Aug 22, 2022
9c2ca7b
Fix account payble save issue.
PITPL-Gayatri-Gajjjar Aug 24, 2022
9971492
print_hide in Stock UOM field in purchase order item .
PITPL-Gayatri-Gajjjar Aug 24, 2022
e779402
cancel_record_po_pr
PITPL-Kaushal-Khute Aug 26, 2022
82a0047
add customer order and SNI to fix texes error
Sep 1, 2022
f472d03
In the Payment Schedule child table, if the Payment Term is AS AGREED…
PITPL-Gayatri-Gajjjar Sep 6, 2022
6297e6f
Remove option mendatory in due date in payment shedualr
PITPL-Gayatri-Gajjjar Sep 12, 2022
b6ba0e4
remove send sms button from menu button in form
Sep 14, 2022
e599bd6
Merge branch 'unizone-migration' of https://github.com/pseudocode-sky…
Sep 14, 2022
bb2d264
Merge pull request #37 from pseudocode-skyai/payment_terms
PITPL-Akshay-Prajapati Sep 14, 2022
9e98c58
Merge branch 'unizone-migration' into due_date
PITPL-Akshay-Prajapati Sep 14, 2022
f6b25fe
Merge pull request #38 from pseudocode-skyai/due_date
PITPL-Akshay-Prajapati Sep 14, 2022
21ad3a0
Customer Order close button un-hide
PITPL-Kaushal-Khute Sep 15, 2022
1dde689
Merge branch 'unizone-migration' of https://github.com/pseudocode-sky…
PITPL-Kaushal-Khute Sep 15, 2022
8efdef0
Remove unnecessary code
PITPL-Kaushal-Khute Sep 15, 2022
0dbc4cd
update reserved qty on create CO
Sep 22, 2022
c3457f0
projected qty report reserved qty update
Sep 23, 2022
e04370a
Product Code to be shown in diff field
PITPL-Kaushal-Khute Oct 5, 2022
bd1d7bb
Remove get update button from login page
Oct 10, 2022
6f5ded1
PO module final production changes as OP suggestion
Oct 10, 2022
f102e32
Po cancle with remove account payble
Oct 11, 2022
271fd95
PR product table customization
Oct 11, 2022
0779134
Merge branch 'unizone-migration' into cancel_record_po_pr
PITPL-Akshay-Prajapati Oct 11, 2022
06102cb
Merge pull request #35 from pseudocode-skyai/cancel_record_po_pr
PITPL-Akshay-Prajapati Oct 11, 2022
f4877e7
payment term child table customization
Oct 11, 2022
3d24021
pr status update on submit "Ready"
Oct 11, 2022
cebd459
PO with ready status print formate
Oct 11, 2022
0564c78
terms, item and item price customization
Oct 11, 2022
89dc236
supplier and customer form disable label change by Deactivate
Oct 11, 2022
469bcc3
on submit PR, SLE error msg change with product instae item
Oct 11, 2022
4ceab11
Merge pull request #48 from pseudocode-skyai/item_code_
PITPL-Akshay-Prajapati Oct 12, 2022
4fbd8e7
remove wrong changes in get items detail form
Oct 14, 2022
91b39d4
Remove rename functionality from all doctype
PITPL-Kaushal-Khute Nov 2, 2022
e8d427b
Merge pull request #51 from pseudocode-skyai/remove_rename_functional…
PITPL-Akshay-Prajapati Nov 2, 2022
c6754a9
Add two field in Customer - Country and Customer Types
PITPL-Kaushal-Khute Nov 4, 2022
4d0dc71
Merge branch 'unizone-migration' of https://github.com/pseudocode-sky…
PITPL-Kaushal-Khute Nov 4, 2022
39cdf56
remove unnecessary files
PITPL-Kaushal-Khute Nov 4, 2022
42a5cf3
Purchase Order Field Readonly in Purchase Receipt
PITPL-Gayatri-Gajjjar Nov 4, 2022
d147964
Add Add FOB before Prices (USD) in Purchase Receipt product table
PITPL-Gayatri-Gajjjar Nov 4, 2022
75cd38c
Merge pull request #54 from pseudocode-skyai/FOB_add_prices
PITPL-Akshay-Prajapati Nov 5, 2022
8fa3c8c
Merge pull request #52 from pseudocode-skyai/add_field_in_customer
PITPL-Akshay-Prajapati Nov 7, 2022
7c8aeb1
Logistic notice "Open" Status before ship.
Nov 7, 2022
034ce1a
Merge branch 'unizone-migration' of https://github.com/pseudocode-sky…
Nov 7, 2022
865f871
- fix console error for "Proposed Ready Date" btn
Nov 7, 2022
22a6cfc
update remaining qty in purchase receipt base on create LNs
Nov 7, 2022
0b456f0
Merge branch 'unizone-migration' into readonly_po_order
PITPL-Akshay-Prajapati Nov 7, 2022
d6191e7
Merge pull request #53 from pseudocode-skyai/readonly_po_order
PITPL-Akshay-Prajapati Nov 7, 2022
5e16a44
price USD label change
Nov 7, 2022
46e0c7b
doctype customer order instead of sales order for reservered qty
Nov 7, 2022
ba9f154
Add Add FOB before Prices (USD) in Purchase Receipt and PO, PR Print …
PITPL-Gayatri-Gajjjar Nov 8, 2022
521bba9
add batch manufacturing_date and expiry_date in SLE
Nov 10, 2022
d70f159
Merge pull request #55 from pseudocode-skyai/add_fob_pr
PITPL-Akshay-Prajapati Nov 14, 2022
69af9a6
Add PO number in batch to show in stock inventory.
Nov 14, 2022
e07ed80
Update Po number in stock ledger entry to show in inventory
Nov 14, 2022
c3aca42
PO to PR flow change and status update.
Nov 18, 2022
b9cfa02
Merge pull request #56 from pseudocode-skyai/po_to_pr_flow_change
PITPL-Akshay-Prajapati Nov 18, 2022
72dfbbf
label change from item to product in item_name field.
Nov 18, 2022
8b0530d
Merge branch 'unizone-migration' of https://github.com/pseudocode-sky…
Nov 18, 2022
b1efe2c
PO status Shipped base on LN Shipped
Nov 22, 2022
209319d
PO status filter remove from PO and Pack price remove from item.
Nov 28, 2022
69d91c0
Print format margin remove to fix child table header override on cont…
Dec 2, 2022
4b504c0
remove warehouse column from child table.
Dec 12, 2022
0195381
condition added for PR delete button, apear if user have delete role.
Dec 19, 2022
4468c06
Stock ledgr CO, Customer's PO column & filter added, Batch wise qty a…
Jan 2, 2023
052750e
co and customer's PO column order change.
Jan 3, 2023
4de2b0a
stock ledger column order changes.
Jan 4, 2023
573e009
product description update in Price form on change in Product form.
Jan 12, 2023
601f886
remove whitespace from beginning and end of a batch field to fix no b…
Jan 19, 2023
a4d8461
customer order submitted status added.
Feb 10, 2023
b5d4acb
currency precision change by 2 in PO and PR
Aditya-skyai Feb 14, 2023
a848de5
Merge pull request #61 from pseudocode-skyai/currency_precision
PITPL-Akshay-Prajapati Feb 14, 2023
5887b9b
price_list_rate field precision change.
Feb 14, 2023
26b3abf
item form desscription field value set.
Apr 5, 2023
1cffe0f
Add delete button in item price form.
Apr 5, 2023
58bb217
faq,customer ,product change
ArunGovind-123 Jul 16, 2024
c28144b
sdm changes
Jul 17, 2024
47fe7d1
Merge branch 'unizone-mobile-app' into unizone-migration
Aditya-skyai Jul 20, 2024
d5e2f27
Merge pull request #74 from pseudocode-skyai/unizone-migration
Aditya-skyai Jul 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 4 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ ignore =
B007,
B950,
W191,
E124, # closing bracket, irritating while writing QB code
E131, # continuation line unaligned for hanging indent
E123, # closing bracket does not match indentation of opening bracket's line
E101, # ensured by use of black

max-line-length = 200
exclude=.github/helper/semgrep_rules
10 changes: 10 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,13 @@

# This commit just changes spaces to tabs for indentation in some files
5f473611bd6ed57703716244a054d3fb5ba9cd23

# Whitespace trimming throughout codebase
9bb69e711a5da43aaf8c8ecb5601aeffd89dbe5a
f0bcb753fb7ebbb64bb0d6906d431d002f0f7d8f

# imports cleanup
4b2be2999f2203493b49bf74c5b440d49e38b5e3

# formatting with black
c07713b860505211db2af685e2e950bf5dd7dd3a
72 changes: 72 additions & 0 deletions .github/helper/.flake8_strict
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
[flake8]
ignore =
B007,
B009,
B010,
B950,
E101,
E111,
E114,
E116,
E117,
E121,
E122,
E123,
E124,
E125,
E126,
E127,
E128,
E131,
E201,
E202,
E203,
E211,
E221,
E222,
E223,
E224,
E225,
E226,
E228,
E231,
E241,
E242,
E251,
E261,
E262,
E265,
E266,
E271,
E272,
E273,
E274,
E301,
E302,
E303,
E305,
E306,
E402,
E501,
E502,
E701,
E702,
E703,
E741,
F403,
W191,
W291,
W292,
W293,
W391,
W503,
W504,
E711,
E129,
F841,
E713,
E712,


max-line-length = 200
exclude=.github/helper/semgrep_rules,test_*.py
18 changes: 12 additions & 6 deletions .github/helper/documentation.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import sys
import requests
from urllib.parse import urlparse

import requests

docs_repos = [
"frappe_docs",
Expand All @@ -24,6 +24,8 @@ def docs_link_exists(body):
parts = parsed_url.path.split('/')
if len(parts) == 5 and parts[1] == "frappe" and parts[2] in docs_repos:
return True
elif parsed_url.netloc == "docs.erpnext.com":
return True


if __name__ == "__main__":
Expand All @@ -32,11 +34,15 @@ def docs_link_exists(body):

if response.ok:
payload = response.json()
title = payload.get("title", "").lower()
head_sha = payload.get("head", {}).get("sha")
body = payload.get("body", "").lower()

if title.startswith("feat") and head_sha and "no-docs" not in body:
title = (payload.get("title") or "").lower().strip()
head_sha = (payload.get("head") or {}).get("sha")
body = (payload.get("body") or "").lower()

if (title.startswith("feat")
and head_sha
and "no-docs" not in body
and "backport" not in body
):
if docs_link_exists(body):
print("Documentation Link Found. You're Awesome! 🎉")

Expand Down
14 changes: 8 additions & 6 deletions .github/helper/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@

set -e

cd ~ || exit

sudo apt-get install redis-server
# Check for merge conflicts before proceeding
python -m compileall -f "${GITHUB_WORKSPACE}"
if grep -lr --exclude-dir=node_modules "^<<<<<<< " "${GITHUB_WORKSPACE}"
then echo "Found merge conflicts"
exit 1
fi

sudo apt install nodejs
cd ~ || exit

sudo apt install npm
sudo apt update && sudo apt install redis-server libcups2-dev

pip install frappe-bench

Expand All @@ -32,7 +35,6 @@ wget -O /tmp/wkhtmltox.tar.xz https://github.com/frappe/wkhtmltopdf/raw/master/w
tar -xf /tmp/wkhtmltox.tar.xz -C /tmp
sudo mv /tmp/wkhtmltox/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf
sudo chmod o+x /usr/local/bin/wkhtmltopdf
sudo apt-get install libcups2-dev

cd ~/frappe-bench || exit

Expand Down
38 changes: 0 additions & 38 deletions .github/helper/semgrep_rules/README.md

This file was deleted.

3 changes: 1 addition & 2 deletions .github/helper/semgrep_rules/frappe_correctness.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import frappe
from frappe import _, flt

from frappe import _
from frappe.model.document import Document


Expand Down
18 changes: 18 additions & 0 deletions .github/helper/semgrep_rules/frappe_correctness.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,3 +131,21 @@ rules:
key `$X` is uselessly assigned twice. This could be a potential bug.
languages: [python]
severity: ERROR


- id: frappe-manual-commit
patterns:
- pattern: frappe.db.commit()
- pattern-not-inside: |
try:
...
except ...:
...
message: |
Manually commiting a transaction is highly discouraged. Read about the transaction model implemented by Frappe Framework before adding manual commits: https://frappeframework.com/docs/user/en/api/database#database-transaction-model If you think manual commit is required then add a comment explaining why and `// nosemgrep` on the same line.
paths:
exclude:
- "**/patches/**"
- "**/demo/**"
languages: [python]
severity: ERROR
14 changes: 14 additions & 0 deletions .github/helper/semgrep_rules/report.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
from frappe import _

# ruleid: frappe-missing-translate-function-in-report-python
{"label": "Field Label"}

# ruleid: frappe-missing-translate-function-in-report-python
dict(label="Field Label")


# ok: frappe-missing-translate-function-in-report-python
{"label": _("Field Label")}

# ok: frappe-missing-translate-function-in-report-python
dict(label=_("Field Label"))
6 changes: 0 additions & 6 deletions .github/helper/semgrep_rules/security.py

This file was deleted.

10 changes: 0 additions & 10 deletions .github/helper/semgrep_rules/security.yml

This file was deleted.

44 changes: 0 additions & 44 deletions .github/helper/semgrep_rules/translate.js

This file was deleted.

61 changes: 0 additions & 61 deletions .github/helper/semgrep_rules/translate.py

This file was deleted.

Loading
Loading