Commit Graph

Select branches

Hide Pull Requests

4283-bug-suspended-sales-not-displaying

Keyboard-Shortcuts

allow-empty-tax-category-id

apply-ci4-coding-standards

arm64-docker-image

bootstrap-5

customer-due-tracking

dependabot/npm_and_yarn/multi-805bfbcd9e

escape-return-policy

extended-payment-delete-fix

feature-add-transactions-to-migrations

feature-php-8.4-compatibility

feature-plugins-framework

fix-attachment-cid

fix-config-notification

fix-invoice-xss-issues

fix-item-number-scan

fix-notify-xss

fix-requisitions

fix-response-content-type

fix-sales-completion

fix-upload-path

fix-writable-permission-check

fix-xss-issues-reports

fix_migration_20250522000000

gh-pages

giftcard-no-person

image-display

master

migration-success-message

no-negative-stock

revert-input-filtering

suspended-sales-fix

ui-improvements

upgade-ci-462

upgrade_github_workflow

validation-fixes

#10

#100

#100

#1006

#101

#101

#1018

#102

#102

#1023

#103

#103

#1041

#105

#106

#106

#107

#107

#1077

#108

#108

#109

#1092

#1099

#1099

#11

#1101

#1102

#1103

#1106

#1107

#1111

#1114

#1115

#1116

#1122

#1128

#1138

#1138

#1140

#1149

#1152

#1152

#1154

#1154

#1157

#1157

#1167

#1167

#1168

#1168

#1169

#1170

#1171

#1178

#1180

#1180

#1181

#1181

#1185

#1188

#1192

#1208

#1208

#1225

#1238

#1239

#1240

#1241

#125

#1253

#1257

#1258

#1258

#1259

#1259

#1264

#1264

#1273

#1281

#1282

#1283

#1296

#13

#1308

#1308

#1321

#1321

#1327

#1330

#1335

#134

#134

#1342

#1349

#1349

#1350

#1350

#1358

#1359

#1360

#1362

#1365

#1365

#1376

#1380

#1386

#1387

#1387

#1393

#1395

#1397

#1398

#142

#1421

#1421

#1431

#1438

#1439

#1441

#1445

#146

#1464

#1464

#1465

#1467

#1468

#148

#15

#15

#1503

#1503

#1508

#151

#151

#1511

#1512

#1513

#1514

#1515

#1516

#1519

#1520

#1521

#1523

#1524

#1525

#1525

#1526

#1532

#1533

#1544

#1544

#1548

#1548

#1549

#1551

#1552

#1560

#1561

#1567

#1571

#1571

#1572

#1572

#1573

#1574

#1575

#1578

#1578

#1582

#1583

#1583

#1584

#1584

#1588

#1591

#1597

#16

#1602

#1606

#1617

#1618

#1621

#1626

#1626

#1639

#164

#1641

#1667

#1667

#1671

#1671

#1672

#1686

#1688

#1688

#169

#17

#170

#1701

#1706

#1706

#1707

#1707

#171

#1717

#1717

#1719

#1719

#1723

#1737

#1737

#1739

#1742

#1744

#1748

#176

#1766

#1767

#1774

#1777

#178

#178

#18

#1800

#1800

#1802

#1802

#1810

#182

#182

#1820

#1827

#1834

#1836

#1842

#185

#1862

#1862

#1864

#1864

#1865

#1865

#1874

#1874

#1878

#1878

#1880

#1880

#1883

#1883

#1899

#19

#191

#1914

#1914

#1917

#1925

#1926

#1926

#193

#194

#1941

#1941

#1942

#1942

#1946

#1953

#1961

#1968

#1968

#1971

#1971

#1973

#1975

#1976

#1981

#1987

#199

#1990

#2

#20

#2006

#2011

#2019

#2022

#2025

#2027

#2028

#203

#2039

#2049

#205

#205

#206

#206

#208

#208

#2080

#2086

#2087

#2089

#2089

#2091

#2104

#2114

#2119

#2119

#2123

#2123

#2124

#2124

#2126

#2127

#2131

#2142

#2144

#2146

#2153

#2153

#2155

#2158

#2162

#2166

#2169

#2169

#2178

#218

#218

#2194

#2200

#2202

#2203

#2215

#2219

#2220

#2237

#2238

#2246

#2252

#226

#226

#2262

#2269

#2289

#23

#2307

#2310

#2314

#2319

#2322

#2325

#2330

#2332

#2333

#2343

#2344

#2345

#2356

#2357

#2362

#2364

#2371

#2375

#2379

#2384

#2388

#2389

#2391

#2393

#2394

#2395

#2396

#2399

#2400

#2402

#2404

#2410

#2412

#2415

#2416

#2420

#2425

#2426

#2427

#2429

#2431

#2434

#2439

#244

#2440

#2448

#2450

#246

#246

#2461

#2462

#2467

#2468

#248

#248

#2482

#2482

#2484

#2488

#249

#249

#2490

#2496

#2528

#2531

#2532

#2534

#2545

#2546

#2547

#2549

#2550

#2557

#2560

#2561

#2562

#2567

#2572

#2575

#2576

#2579

#2581

#2583

#26

#2603

#2606

#2609

#2611

#2619

#2624

#2633

#2639

#2641

#2655

#2656

#2658

#2660

#2662

#2668

#2678

#270

#2700

#2701

#2705

#2706

#2707

#2708

#2709

#2718

#2719

#272

#2720

#2727

#2739

#274

#274

#2741

#2742

#2753

#2754

#2759

#2760

#2761

#2762

#2763

#2764

#2780

#2786

#279

#2791

#2792

#2797

#2798

#2805

#2806

#2814

#2816

#2821

#2824

#2828

#283

#2830

#2840

#2849

#2852

#2870

#2871

#2876

#2880

#2885

#2886

#29

#2903

#2909

#2910

#2926

#2927

#2931

#2933

#2939

#2946

#2948

#2950

#2954

#2969

#2970

#2971

#2980

#2982

#2986

#299

#2991

#2994

#2997

#3

#30

#30

#3001

#3002

#3003

#3011

#3015

#3021

#3022

#3024

#3026

#3029

#3030

#3038

#3039

#3040

#3045

#3047

#3049

#3056

#3060

#3068

#3069

#3073

#3080

#3083

#3090

#3095

#3098

#3099

#3101

#3102

#3106

#3107

#3113

#3115

#3118

#3124

#3125

#3130

#3139

#3143

#3146

#3148

#3149

#3150

#3151

#3161

#3161

#3167

#3168

#317

#3186

#319

#3190

#3193

#3194

#3197

#3198

#3210

#3211

#3212

#3213

#3219

#3220

#3230

#3243

#3248

#3249

#3257

#3258

#3259

#3263

#3264

#3265

#3266

#3270

#3271

#3274

#3278

#3286

#3302

#3306

#3307

#3312

#3313

#3316

#3318

#3319

#3321

#3323

#3325

#3331

#3333

#3337

#3341

#3343

#3380

#3383

#3392

#3396

#3397

#3399

#3401

#3403

#3404

#3408

#3447

#3448

#3460

#3462

#3465

#3466

#3471

#348

#348

#3486

#3488

#3489

#3490

#3492

#3493

#3494

#3495

#3496

#3497

#3498

#3514

#3526

#3535

#3537

#3541

#3544

#3569

#3571

#3580

#3587

#3592

#3594

#3596

#3597

#3607

#3618

#3625

#3643

#3645

#365

#365

#3650

#3651

#3653

#3704

#3705

#3706

#3707

#3709

#3720

#3720

#3746

#3747

#376

#378

#3781

#3788

#3791

#3792

#3798

#3798

#3804

#3808

#3811

#3815

#3816

#3817

#3825

#3827

#3828

#3829

#383

#383

#3830

#3832

#3834

#3836

#3838

#3841

#3845

#3846

#3847

#3857

#3858

#3876

#3884

#3905

#3906

#3910

#3911

#3912

#3915

#3917

#3920

#3921

#3924

#3929

#3931

#3932

#3936

#3937

#3942

#3944

#3946

#3947

#3949

#3950

#3952

#3953

#3958

#3960

#3961

#3962

#3980

#3981

#3982

#3986

#3988

#3989

#399

#3991

#3995

#3996

#4

#4001

#4002

#4007

#4014

#4015

#4019

#4024

#4027

#4032

#4034

#4035

#4038

#4040

#4041

#4043

#4049

#4056

#4057

#4058

#4060

#4061

#4065

#4066

#4069

#4073

#4077

#4078

#4079

#4080

#4089

#4091

#4106

#4108

#4109

#4110

#4111

#4116

#4117

#4119

#4121

#4129

#4131

#4132

#4132

#4139

#4139

#4146

#4148

#4148

#4149

#415

#415

#4150

#4151

#4158

#4159

#4160

#4161

#4162

#4163

#4167

#4173

#4177

#4179

#4186

#4189

#4190

#4195

#4196

#4197

#4198

#4199

#4201

#4204

#4205

#4206

#4210

#4211

#4215

#4217

#4218

#4219

#4220

#4223

#4225

#4227

#4228

#4229

#4230

#4231

#4232

#4238

#4249

#4250

#4253

#4255

#4255

#4261

#4262

#4269

#4269

#4271

#4273

#4274

#4278

#4280

#4281

#4281

#4284

#4286

#4288

#4292

#4298

#4303

#4305

#4305

#4309

#4314

#4315

#4318

#4327

#4332

#4332

#4334

#4336

#4336

#4341

#4342

#4342

#4343

#4344

#4349

#4350

#4355

#4356

#4357

#4357

#4358

#4358

#436

#4361

#4362

#4362

#4363

#4363

#4364

#4366

#4366

#4367

#4367

#4369

#449

#461

#467

#468

#471

#471

#48

#48

#480

#480

#488

#488

#501

#501

#503

#504

#504

#515

#515

#517

#517

#524

#531

#531

#534

#548

#548

#549

#569

#578

#6

#60

#60

#601

#602

#602

#668

#668

#669

#669

#671

#671

#673

#673

#679

#679

#7

#706

#718

#718

#720

#720

#750

#750

#79

#799

#799

#844

#844

#88

#88

#9

#93

#95

#95

#952

#953

#953

#956

#956

#96

#96

#962

#962

#979

#979

#98

#98

#989

#99

#99

2.2.2

2.3

2.3.1

2.3.2

2.3.3

2.3.4

2.4.0

3.0.0

3.0.1

3.0.2

3.1.0

3.1.1

3.2.0

3.2.1

3.2.2

3.2.3

3.3.0

3.3.1

3.3.2

3.3.3

3.3.4

3.3.5

3.3.6

3.3.7

3.3.8

3.3.9

3.4.0

3.4.1

CodeIgniter_4_upgrade.3.4.0-dev

eventsauce.3.4.0-dev

fix-employee-update.3.4.0-dev

formatting_corrections.3.4.0-dev

login-improvements.3.4.0-dev

master.3.3.5

master.3.3.6

master.3.4.0-dev

person_attributes.3.4.0-dev

unstable

upgrade-grunt-and-npm

Mono Color

• 5f3a81ee5c Merge branch 'master' of https://github.com/jekkos/opensourcepos jekkos-t520 2014-11-25 23:04:25 +01:00
• af8b88d030 Fix config module layout (wider + adapt setting labels) jekkos-t520 2014-11-25 21:45:01 +01:00
• 08368b6279 Update register.php Florian 2014-11-25 20:24:46 +01:00
• 97d37b5ad9 Merge branch 'feature/sale_numbering' jekkos-t520 2014-11-25 17:20:05 +01:00
• 969abe1d34 Merge pull request #7 from flodef/patch-1 jekkos 2014-11-25 11:35:07 +01:00
• 5a40c31af3 Merge branch 'fix/recv_amount_multiplication' jekkos-t520 2014-11-25 08:36:03 +01:00
• 62977bf89f Refresh only editd rows after bulk refresh jekkos-t520 2014-11-25 08:32:55 +01:00
• f88baad4b7 Merge pull request #3 from songwutk/patch-2 jekkos 2014-11-25 00:11:26 +01:00
• 27de99fe78 Update giftcards.php Florian 2014-11-24 20:11:47 +01:00
• 44515ee999 Update database.sql Florian 2014-11-24 20:06:44 +01:00
• 90c1934d92 Merge pull request #6 from curthauta/import_items jekkos 2014-11-20 10:19:41 +01:00
• bb3fbb03b1 Merge pull request #9 from flodef/patch-2 jekkos 2014-11-20 10:17:39 +01:00
• d6926fee9f Merge pull request #10 from flodef/patch-3 jekkos 2014-11-20 10:15:49 +01:00
• ba47d5e4ff Update register.php flodef 2014-11-14 22:40:36 +01:00
• fe14180ec5 Update register.php flodef 2014-11-14 22:30:16 +01:00
• 15d15b9750 Update register.php flodef 2014-11-14 20:31:04 +01:00
• 46af17845f Merge branch 'master' of https://github.com/jekkos/opensourcepos jekkos-t520 2014-11-13 16:51:09 +01:00
• 2c706dc752 Rename receivings_quantity to receiving_quantity jekkos-t520 2014-11-13 16:50:52 +01:00
• 4893da0e43 Added enable invoice checkbox jekkos-t520 2014-11-13 13:10:21 +01:00
• 26bee3e5a6 Update Sale_lib.php flodef 2014-11-11 13:04:27 +01:00
• 1b41c93441 Fix item row refresh in detailed receivings and sales jekkos-t520 2014-11-07 18:03:45 +01:00
• 1dd9a7ea2c Merge pull request #4 from songwutk/patch-3 jekkos 2014-11-06 08:52:27 +01:00
• 6286f6cc11 Merge pull request #2 from songwutk/patch-1 jekkos 2014-11-06 08:14:11 +01:00
• 094a293c78 Fix invoice number insert in receivings jekkos-t520 2014-11-06 07:35:54 +01:00
• 8ae21bbcb7 fixed quantities on items import Curt Hauta 2014-11-05 20:01:25 -07:00
• 035f2ad946 Review receivings quantity mulitplier jekkos-t520 2014-11-04 08:14:16 +01:00
• 54fe0c4c30 Fix sales/receivings deletion jekkos-t520 2014-11-03 19:22:36 +01:00
• d43015e8c9 Set default receivings value for items to 1 in database Fix item quantity save jekkos-t520 2014-11-03 17:49:18 +01:00
• 7a46078734 Add receivings_quantity to item form jekkos-t520 2014-11-03 08:50:20 +01:00
• 3007173833 Add invoice numbering to sales module jekkos-t520 2014-10-30 19:22:49 +01:00
• 96c349b099 Add invoice numbering to sales module jekkos-t520 2014-10-30 19:22:49 +01:00
• e5e74f3ffb Update Thai translate songwutk 2014-10-26 06:37:53 +07:00
• 851333b72c fix bug duplicate config songwutk 2014-10-26 06:29:07 +07:00
• 00045c3f97 Rename Thai menu (Gift Card) songwutk 2014-10-26 06:14:28 +07:00
• cc9adeef47 Set supplier_info to default value (fix warning with empty supplier) jekkos-t520 2014-10-23 21:13:36 +02:00
• 37c80deb83 Show error message correctly in receivings jekkos-t520 2014-10-23 18:35:06 +02:00
• 9d765efc94 Add invoice number duplication check in receivings screen Add invoice number duplication check in receivings detailed report jekkos-t520 2014-10-23 18:02:33 +02:00
• 4e071c9fbb Fix blank page when returning receivings jekkos-t520 2014-10-22 07:00:43 +02:00
• fe6820920b Add edit form in detailed receivings report Add language lines for detailed sale & receiving validation Add permission for getting updated sale & receiving detail row jekkos-t520 2014-10-21 21:39:22 +02:00
• 08dcd9e384 Fix totals calculation in receivings module jekkos-t520 2014-10-20 18:31:33 +02:00
• 31877528b1 Security update for report subpermissions jekkos-t520 2014-10-17 08:29:46 +02:00
• 7fad710277 Reports module now has checks on the required submodules when entering direct urls jekkos-t520 2014-10-16 18:31:35 +02:00
• 7bcb1d7531 Fix totals calculation in sales register jekkos-t520 2014-10-16 08:23:47 +02:00
• 0863b4ebba Add extra permissiosn checks to report methods Adapt no_access page to show missing grant Adapt Email library to customize return_path header jekkos-t520 2014-10-16 08:20:36 +02:00
• 20fed1d457 Update database script to latest version again jekkos-t520 2014-10-13 19:09:42 +02:00
• bc514889a8 Add detailed reports again (permission_id wasn't set properly) Finish updqate script jekkos-t520 2014-10-13 18:56:06 +02:00
• 868de15fcb Invoice number is now substituted correctly after complete Fix payments summary report Update upgrade script (not tested yet) jekkos-t520 2014-10-13 12:30:37 +02:00
• dad16b7a71 Receivings comments and recv_invoice_format fields are updated on keyup now jekkos-t520 2014-10-12 12:47:45 +02:00
• de06b64e4e Fix warning in specific discount report (add category to query) Add grant for default stock location in sql jekkos-t520 2014-10-12 03:18:19 +02:00
• ac667a23dc Refactor report listing (again) All reports have proper permissions now (categories, taxes, discounts,..) Minor refactoring and code cleanup jekkos-t520 2014-10-12 02:54:54 +02:00
• 54fbb4e7d7 Refactor stock location save Add config to permissions and grants in database script jekkos-t520 2014-10-11 17:55:00 +02:00
• cda41622e4 Merge branch 'refactor/module_permissions' into feature/invoice_numbering jekkos-t520 2014-10-10 16:38:07 +02:00
• 802a0e6a59 Refactor report listing (move sales specific grants to employee model) jekkos-t520 2014-10-09 17:56:24 +02:00
• 77222c1989 Fix supplier selection jekkos-t520 2014-10-08 19:27:07 +02:00
• bb9ab9bd9c Finish stock location refactoring Modules are inaccessible if permissions not configured correctly jekkos-t520 2014-10-07 21:47:07 +02:00
• a1eb735d96 Remove empty check for item_id and quantity_id when saving item_quantities Add configuration key to database script jekkos-t520 2014-10-07 08:27:31 +02:00
• aee5f3d27e Add ospos_grants table Refactor permission and module system jekkos-t520 2014-10-07 00:47:30 +02:00
• 97ff190ba5 Receivings can now use invoice numbers with a specified format (in config section) Fix some more stock location related bugs Some refactoring todo for creating/updating stock locations jekkos-t520 2014-10-05 22:53:42 +02:00
• 1afbc03304 Merge branch 'feature/multistore_support' into feature/invoice_numbering jekkos-t520 2014-10-04 16:49:22 +02:00
• 5e8367681b Fix default location in items, sales and receivings jekkos-t520 2014-10-04 13:38:52 +02:00
• bac80e3a92 Added invoice_number field to receivings table Save comments field in receivings as in sales Add translations for cancel button in receivings Add cascading deletes for ospos_permissions jekkos-t520 2014-10-03 10:24:08 +02:00
• 5a4ac8dde3 Fix comments in receivings jekkos-t520 2014-10-03 17:41:39 +02:00
• e994cd5444 Fix default location selected (now uses allowed locations only) jekkos-t520 2014-10-03 10:33:34 +02:00
• d486202c4f Merge branch 'feature/multistore_support' into feature/invoice_numbering jekkos-t520 2014-10-03 08:03:59 +02:00
• 298135dabc Remove obsolete item_unit method jekkos-t520 2014-10-03 08:03:37 +02:00
• eb51b680aa Show stock location names in employee form jekkos-t520 2014-10-02 23:26:29 +02:00
• 48acd204f1 Show stock location names in employee form jekkos-t520 2014-10-02 23:26:29 +02:00
• 2929dfe9dd Add stock location filtering on items jekkos-t520 2014-10-02 19:33:35 +02:00
• 290533612e Fix submodules in header jekkos-t520 2014-09-29 21:06:06 +02:00
• 13127c4dc7 Deny access to report submodules on which employee doesn't have permissions jekkos-t520 2014-09-24 08:47:00 +02:00
• 5cf73130c5 Modules are not accessible if employee has no permissions on at least one of it's submodules Some more db script modifications jekkos-t520 2014-09-23 19:14:25 +02:00
• 4b16b68f24 Added more granular permissions for report module Extend permission system to allow 'submodule' permissions Add permissions for stock locations (multistore support) jekkos-t520 2014-09-20 18:27:24 +02:00
• e03611080e Merge branch 'feature/tax_included_pricing' jekkos-t520 2014-09-15 21:27:33 +02:00
• ff7b305058 Added tax inclusive pricing to sales and receivings jekkos-t520 2014-09-15 20:16:05 +02:00
• 0d76974e69 Discount field in receiving made editable again jekkos-t520 2014-09-15 20:14:37 +02:00
• 87c242b35f Discount field in receiving made editable again jekkos-t520 2014-09-15 20:14:37 +02:00
• e43f7ac7bb Add deleted checkbox filter in items page (was remove due to wrong merge) jekkos-t520 2014-09-10 19:03:19 +02:00
• c9c389e9f3 Update README and WHATS NEW jekkos 2014-08-20 05:46:09 +00:00
• fc4db6553e Update README and WHATS NEW 2.3 jekkos-t520 2014-08-19 23:37:37 +02:00
• 1487afb19b Merge branch 'sourceforge-svn' jekkos-t520 2014-08-19 22:19:37 +02:00
• 6e6cfb3fb1 Database script renamed jekkos 2014-08-19 19:56:18 +00:00
• 04e3c13dd1 Default stock name is the same as in update script jekkos 2014-08-19 19:56:14 +00:00
• cd209d50f3 Location column is kept in database Added a data migration script for stock_locations and item_quantities tables jekkos 2014-08-19 19:56:12 +00:00
• 9556500813 Clear sale and receiving libs (sessoin state) when changing stock locations jekkos 2014-08-19 19:56:08 +00:00
• 18517c47e8 Stock locations are now shown on receivings and sales receipts Database migration script now defines a default stock location name Rmeove obsolete constraints from migration script jekkos 2014-08-19 19:56:05 +00:00
• 6663de83f8 Fix barcode generation (removed whitespace from stock_locations model) Fix error in receivings receipt Update database migration script (needs more review) jekkos 2014-08-19 19:56:01 +00:00
• a1b2d99581 Add migration script for 2.2.2 to 2.3 Update database script (add extra foreign keys + minor cleanup) jekkos 2014-08-19 19:55:57 +00:00
• 0a2b6e2d41 Fix requisitions report (can be found under receiving type = requisitions) jekkos 2014-08-19 19:55:55 +00:00
• 5ef5006577 Requisition is now registered as receiving for destination stock and return for source stock Remove specific requisition report and code Adapt receivings report to show requisitions in a generic way jekkos 2014-08-19 19:55:52 +00:00
• 4ca452ef12 Fixed sale suspending / unsuspending (adapt db scripts) Cleanup old code More code review Update item_quantities database model (composite pk) jekkos 2014-08-19 19:55:46 +00:00
• 249274e5f5 Add foregin key constraints to stock_locations and item_quantities tables Requisition options is only shown when multiple stock locations are configured Fix stock locations config in the configuration page Rename item_quantitys to item_quantities Fix a missing label (need to check if present in master) Fix display of the stock quantities in items/manage view jekkos 2014-08-19 19:55:40 +00:00
• 37e4eb8bd2 Add quantity column in item page Fix bug about validating stock location config jekkos 2014-08-19 19:55:34 +00:00
• 2ce140f6d3 Added empty check in stock_locations config Rework database script (contains stock_locations + item_quantities tables) jekkos 2014-08-19 19:55:30 +00:00
• 40cecaf571 Fix quantity removal in items page jekkos 2014-08-19 19:55:27 +00:00
• 1c6e44af0f Add multi-stock feature Finished task 1. User can add stock location in config page. Adding format is StockA,StockB,StockC for example 2. Item page, there is no more quantity column show in cert table. The quantity tracking is integrated in inventory detail 3. Receiving page, There is a stock location for user to select before receiving or returning stuff 4. Sale page, There is a stock location which is for user to select a stock location they sell from jekkos 2014-08-19 19:55:24 +00:00
• b6012ae2ca Fix: Qty. column is not show in requisition report jekkos 2014-08-19 19:55:16 +00:00
• 6ff1cb007c requisition receipt fixed database.sql script merged with current ospos one remaining problems in reporting (sale_type to add in sales_temp query?) data model should be refactored to allow more genericity for custom item locations (2+) inventory tracking should be adapted to use multiple locations (instead of duplicating items for different locations) jekkos 2014-08-19 19:55:13 +00:00
• eeb01a3717 Add database migration script for 2.2.0 jekkos 2014-08-19 13:04:01 +00:00
• 490f0c89dd Remove old db script jekkos 2014-08-19 13:03:26 +00:00
• 60eb493b1f Database script renamed 2.2.2 jekkos-t520 2014-08-17 01:55:51 +02:00