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

• faadbe554a Change kit item selection from the Item Kit maintenance to only select kit items. Steve Ireland 2017-02-01 14:43:16 -05:00
• 999e12279a Extract pic_filename update into method (clean code #1026) jekkos 2017-02-01 08:08:51 +01:00
• 37bb9b50f9 Bump Mysql version in docker dev container (#630, #591) jekkos 2017-01-31 21:53:41 +01:00
• 5e02f31866 Fix bugs (#1026) FrancescoUK 2017-01-31 23:16:38 +00:00
• bf0d24a96f Fix bugs (#1026) FrancescoUK 2017-01-31 23:08:56 +00:00
• be66258bfc Fix bugs (#1026) FrancescoUK 2017-01-31 23:03:53 +00:00
• 87247333cc Fix bugs (#1026) FrancescoUK 2017-01-31 22:52:37 +00:00
• 5e75613fec Update LICENSE file FrancescoUK 2017-01-31 21:14:20 +00:00
• 5b4d12cac8 Improve Items picture storing (#1026) FrancescoUK 2017-01-31 20:23:59 +00:00
• 0e013220ad Use PHP7 + newest MariaDB in docker compose + cloud (#630, #591) jekkos 2017-01-31 19:24:40 +01:00
• ae92231903 Generate low inventory message if at least one of the item kit items added to a sale are below the reorder level. Steve Ireland 2017-01-31 09:03:36 -05:00
• 9a1cf6752c Change the inventory reports to exclude non-stock items. Steve Ireland 2017-01-31 08:29:14 -05:00
• 9db439a8fe Merge pull request #1107 from RuleDomain/low-inventory-check-for-kits FrancescoUK 2017-01-31 20:02:34 +00:00
• e458b23b7e Merge pull request #1106 from RuleDomain/fix-inventory-low-missing-reorder_level-check FrancescoUK 2017-01-31 20:00:21 +00:00
• 4ca0e74d42 Use PHP7 + newest MariaDB in docker compose + cloud (#630, #591) jekkos 2017-01-31 19:24:40 +01:00
• 47357aaafc Merge branch 'master' into pic_filename i92guboj 2017-01-31 16:04:33 +01:00
• a99f326bb8 Generate low inventory message if at least one of the item kit items added to a sale are below the reorder level. Steve Ireland 2017-01-31 09:03:36 -05:00
• cc584ca063 Change the inventory reports to exclude non-stock items. Steve Ireland 2017-01-31 08:29:14 -05:00
• d85aeaeaf8 Merge pull request #1103 from RuleDomain/restrict-inventory-reports-to-stock-items FrancescoUK 2017-01-31 08:05:54 +00:00
• cc2fd1876d Merge pull request #1102 from RuleDomain/fix-out-of-stock-warning FrancescoUK 2017-01-31 08:04:52 +00:00
• f4a52dab8b Merge pull request #1101 from RuleDomain/fix-for-line_sequence FrancescoUK 2017-01-31 08:03:52 +00:00
• d75a936472 Change the inventory reports to exclude non-stock items. Steve Ireland 2017-01-30 21:34:32 -05:00
• 2719c43e3d Fix for issue where the warning messages for out of stock or below reorder level were not being sent to the user. Steve Ireland 2017-01-30 20:38:24 -05:00
• 85983cd17a Fix merge issues related to line_sequence for receipts and invoices Steve Ireland 2017-01-30 19:03:57 -05:00
• df9b776d56 Add support for MySQL 5.7 (#630) and PHP7 (#591), better Item Kits (#625) FrancescoUK 2017-01-30 20:10:17 +00:00
• b373b1e07e Merge branch 'master' into pic_filename i92guboj 2017-01-30 17:45:47 +01:00
• 68cf3bf68b Merge remote-tracking branch 'jekkos/item-kit' into item-kit Steve Ireland 2017-01-29 23:10:37 -05:00
• f9c1dde054 Changes to support Item Kits, support for MySQL 5.7, and a tweak for PHP 7 Steve Ireland 2017-01-19 22:03:32 -05:00
• 1393af1676 Fix Summary payments and taxes issue (#932) FrancescoUK 2017-01-29 19:44:45 +00:00
• f359c475d3 Fix Takings issue (#932) FrancescoUK 2017-01-29 19:31:02 +00:00
• 9bc9b5c984 Add date/time summary payment report (#932) FrancescoUK 2017-01-29 18:10:14 +00:00
• 4922f5bb66 Add date/time config translation (#932) FrancescoUK 2017-01-29 17:57:21 +00:00
• e36b2a1a03 Add Support for filter reports with format date/time (#932) FrancescoUK 2017-01-29 17:43:38 +00:00
• bb5d39cd0d Fix partial/header.php change FrancescoUK 2017-01-29 17:09:00 +00:00
• afe564e152 Fix LICENSE file FrancescoUK 2017-01-29 16:57:47 +00:00
• 17ff097406 Third commit RamkrishnaMondal 2017-01-29 21:32:16 +05:30
• 3b37f6c61a Fix Detailed Receiving Report not showing Supplier (#1093) FrancescoUK 2017-01-29 15:51:26 +00:00
• 96cefd97b4 Second commit RamkrishnaMondal 2017-01-29 17:44:35 +05:30
• 03af00e26e First commit RamkrishnaMondal 2017-01-29 17:34:55 +05:30
• 92bd7c2d43 Amend license file with copyright dates jekkos 2017-01-28 11:41:09 +01:00
• 4d6cc381ae Bump version to 3.1.0 FrancescoUK 2017-01-27 18:37:09 +00:00
• 3f36a8b15e Bump version to 3.1.0 FrancescoUK 2017-01-27 18:36:34 +00:00
• 5a9b6bd98b Add ERD for sales diagram (for wiki page) jekkos 2017-01-22 11:18:19 +01:00
• b9e160eaa3 Improve PHP7 compatibility (#591) jekkos 2017-01-21 00:01:59 +01:00
• ba95853884 Remove quirk in master (#1076) jekkos 2017-01-20 23:22:50 +01:00
• f157d4d43d Translated using Weblate (Turkish) Emin Tufan Çetin 2017-01-14 06:54:48 +00:00
• a2c3130720 Translated using Weblate (Dutch (Belgium)) mitchel 2016-12-28 20:16:52 +00:00
• 258622ec87 Enable jsPrint for custom receipt templates (#1070) jekkos 2017-01-19 23:54:30 +01:00
• b4023a051c Update WHATS_NEW.txt with 3.0.2 improvements FrancescoUK 2016-12-31 20:59:38 +00:00
• 1cdbee1a42 Fix Summary Reports Payments (#1045) FrancescoUK 2016-12-30 18:26:43 +00:00
• feff5ff3f3 Set folder upload folder permissions to 755 (#1014) Don't load item avatar if item_pic is empty jekkos 2016-12-28 20:19:09 +01:00
• 0507db6a6f Set apache as owner of uploads folder (#1014) jekkos 2016-12-28 18:36:16 +01:00
• 9b473e415d Hook standard jquery submit function and update csrf (#1019) jekkos 2016-12-28 18:12:54 +01:00
• 47974074ee Stop running compose as travis seems to fail after startup? jekkos 2016-12-28 01:38:06 +01:00
• bc56ee54a3 Fix date, location and sale type filtering for summary payments (#1045) jekkos 2016-12-28 01:30:21 +01:00
• 046a02d83c Refresh csrf tokens before submit (#1019) jekkos 2016-12-28 01:24:47 +01:00
• 57e559e67b Translated using Weblate (Dutch (Belgium)) mitchel 2016-12-25 12:55:46 +00:00
• 10e3ce9a9f Fix csrf refresh issue in register (#1019) jekkos 2016-12-27 23:59:22 +01:00
• 953fa534f4 Print just first letter of Employee family name to protect privacy (#1027) FrancescoUK 2016-12-04 21:15:56 +00:00
• c7982b9552 Bump OSPOS version to 3.0.2 FrancescoUK 2016-12-04 21:10:28 +00:00
• 6e0011b165 Fix Invoice Template editing issues (#1088), centre company name on top navbar FrancescoUK 2017-01-29 17:15:46 +00:00
• a3c172624a Fix partial/header.php change FrancescoUK 2017-01-29 17:09:00 +00:00
• 3a81a712ff Fix LICENSE file FrancescoUK 2017-01-29 16:57:47 +00:00
• 775f40cb75 Merge pull request #8 from jekkos/master RamkrishnaMondal 2017-01-29 21:51:12 +05:30
• 5814bfc7e8 Third commit RamkrishnaMondal 2017-01-29 21:32:16 +05:30
• 3f309298d8 Fix Detailed Receiving Report not showing Supplier (#1093) FrancescoUK 2017-01-29 15:51:26 +00:00
• 4ef8fc8df3 Second commit RamkrishnaMondal 2017-01-29 17:44:35 +05:30
• a627276265 First commit RamkrishnaMondal 2017-01-29 17:34:55 +05:30
• 6e4155ccbb Merge pull request #7 from jekkos/master RamkrishnaMondal 2017-01-29 16:23:07 +05:30
• 84ef147835 Bump PHP version to 7.0 jekkos 2017-01-28 18:50:01 +01:00
• 925bee2b0a Amend license file with copyright dates jekkos 2017-01-28 11:41:09 +01:00
• 680f2bb555 Bump version to 3.1.0 FrancescoUK 2017-01-27 18:37:09 +00:00
• 29920c5456 Bump version to 3.1.0 FrancescoUK 2017-01-27 18:36:34 +00:00
• ace3bedbbc Correct typo Steve Ireland 2017-01-22 20:53:43 -05:00
• 476db84e86 Change SUM to MAX and a couple of indent issues. Steve Ireland 2017-01-22 16:40:20 -05:00
• dc638c74b5 Resolves Item view and Takings view issues that odiea spotted. Steve Ireland 2017-01-22 10:57:59 -05:00
• f04a2db4a5 Add ERD for sales diagram (for wiki page) jekkos 2017-01-22 11:18:19 +01:00
• dd6bd1cf11 Changes to support Item Kits, support for MySQL 5.7, and a tweak for PHP 7 Steve Ireland 2017-01-19 22:03:32 -05:00
• 4b1d5456cc Improve PHP7 compatibility (#591) jekkos 2017-01-21 00:01:59 +01:00
• 4b85c14f00 Remove quirk in master (#1076) jekkos 2017-01-20 23:22:50 +01:00
• 9b33f39086 Translated using Weblate (Turkish) Emin Tufan Çetin 2017-01-14 06:54:48 +00:00
• bebb9ca34b Translated using Weblate (Dutch (Belgium)) mitchel 2016-12-28 20:16:52 +00:00
• 1dba07049c Enable jsPrint for custom receipt templates (#1070) jekkos 2017-01-19 23:54:30 +01:00
• aae2d8ffc8 Update WHATS_NEW.txt with 3.0.2 improvements 3.0.2 FrancescoUK 2016-12-31 20:59:38 +00:00
• a387a52578 Fix Summary Reports Payments (#1045) FrancescoUK 2016-12-30 18:26:43 +00:00
• 399b997fd0 Set folder upload folder permissions to 755 (#1014) Don't load item avatar if item_pic is empty jekkos 2016-12-28 20:19:09 +01:00
• cb907ea303 Set apache as owner of uploads folder (#1014) jekkos 2016-12-28 18:36:16 +01:00
• 744d166f58 Hook standard jquery submit function and update csrf (#1019) jekkos 2016-12-28 18:12:54 +01:00
• f3dd11e2c5 Stop running compose as travis seems to fail after startup? jekkos 2016-12-28 01:38:06 +01:00
• 7f1c374e3d Fix date, location and sale type filtering for summary payments (#1045) jekkos 2016-12-28 01:30:21 +01:00
• 80aba48240 Refresh csrf tokens before submit (#1019) jekkos 2016-12-28 01:24:47 +01:00
• a8bca7681d Translated using Weblate (Dutch (Belgium)) mitchel 2016-12-25 12:55:46 +00:00
• 01e918e776 Fix csrf refresh issue in register (#1019) jekkos 2016-12-27 23:59:22 +01:00
• 6095577f47 ran grunt i92guboj 2016-12-20 22:03:16 +01:00
• 06db967ee6 simplify code cause pic_thumb() always receives filename.ext i92guboj 2016-12-20 20:46:00 +01:00
• 467ed586b1 indentation and revert func parameter experiment i92guboj 2016-12-19 20:46:30 +01:00
• 74660bcaa1 migration script for already existing DBs i92guboj 2016-12-19 20:19:05 +01:00
• d9a4f93cfa pic_filename behavior and silent migration from pic_id i92guboj 2016-12-19 20:18:05 +01:00
• c6e4584f71 Convert pic_id to pic_filename - db and csv files i92guboj 2016-12-19 18:37:52 +01:00
• 3a2dd7134f Print just first letter of Employee family name to protect privacy (#1027) FrancescoUK 2016-12-04 21:15:56 +00:00