Commit Graph

560 Commits

Author SHA1 Message Date
8a813023f4 fix delivery address 2021-01-10 23:05:36 +06:30
4839109280 fix carton 2021-01-10 15:56:27 +06:30
83cea10328 Merge branch 'master' of tzw/fcs into master 2021-01-09 13:31:25 +00:00
Thinzar Win
9d2f9a671f add carton from mix_box & from cargos 2021-01-09 19:11:47 +06:30
0bbd568adc Merge branch 'master' of tzw/fcs into master 2021-01-08 19:58:09 +00:00
32b8c5ae93 update carton from packages 2021-01-08 17:13:51 +06:30
f0662ff1d0 Merge branch 'master' of tzw/fcs into master 2021-01-07 11:49:56 +00:00
016ebed384 update carton 2021-01-07 18:15:39 +06:30
1a96fb1675 Merge branch 'master' of https://git.mokkon.com/sainw/fcs 2021-01-07 17:25:24 +06:30
045d27945b b+8 2021-01-05 18:03:51 +06:30
50763de3f3 Merge branch 'master' of https://git.mokkon.com/sainw/fcs 2021-01-04 17:19:12 +06:30
ee586e8f41 fix rates 2021-01-04 17:19:01 +06:30
afff3fe115 Merge branch 'master' of tzw/fcs into master 2020-12-11 15:36:09 +00:00
Thinzar Win
b8707b8f87 update carton info 2020-12-11 17:34:56 +06:30
3fdcb851ed Merge branch 'master' of tzw/fcs into master 2020-12-10 16:03:47 +00:00
Thinzar Win
cc64845723 update carton and add staff name 2020-12-10 20:07:11 +06:30
Thinzar Win
d1261a33c1 update carton and add staff name 2020-12-10 20:06:15 +06:30
d540bfbd30 Merge branch 'master' of tzw/fcs into master 2020-12-08 15:24:54 +00:00
Thinzar Win
20477b6915 add prompt confirmation and update carton 2020-12-08 20:24:15 +06:30
1a7b1ce97b Merge branch 'master' of tzw/fcs into master 2020-12-08 01:31:18 +00:00
Thinzar Win
a1cac94275 update carton 2020-12-07 17:18:26 +06:30
bb264a7a1c Merge branch 'master' of tzw/fcs into master 2020-12-04 15:48:56 +00:00
Thinzar Win
0b339e9dc1 add two decimal and add confirm dialog if press back button 2020-12-04 17:28:21 +06:30
d5a3c4410e remove spacer 2020-12-04 09:03:19 +06:30
af28300222 add cartonsize api 2020-12-03 17:21:59 +06:30
3ff10c86ed Merge branch 'master' of https://git.mokkon.com/sainw/fcs 2020-12-03 08:28:44 +06:30
57e08502b7 Merge branch 'master' of https://git.mokkon.com/sainw/fcs 2020-12-03 08:26:58 +06:30
3b9a098e8a Merge branch 'master' of tzw/fcs into master 2020-12-02 15:37:46 +00:00
Thinzar Win
42bb217c2c update processing 2020-12-02 20:55:00 +06:30
8e73ba2d8b Merge branch 'master' of tzw/fcs into master 2020-12-01 14:51:57 +00:00
Thinzar Win
230e6f9e66 add FCS UI 2020-12-01 19:02:21 +06:30
Thinzar Win
a2c9e41f55 resolve conflit 2020-12-01 10:38:12 +06:30
Thinzar Win
9ffd727e86 resolve conflit 2020-12-01 10:34:23 +06:30
Sai Naw Wun
b5a1369297 fix package delete filter 2020-11-30 04:53:56 +06:30
Thinzar Win
809c6905e1 Merge remote-tracking branch 'upstream/master' 2020-11-19 14:27:41 +06:30
Thinzar Win
15f2b79ee0 resolve conflit 2020-11-19 14:27:29 +06:30
c79fab4cc7 Merge branch 'master' of https://git.mokkon.com/sainw/fcs 2020-11-13 03:23:37 +06:30
Sai Naw Wun
96330a80dc speed up file uploads 2020-11-13 03:09:53 +06:30
fab5d8f455 Merge branch 'master' of https://git.mokkon.com/sainw/fcs 2020-11-13 02:39:42 +06:30
Sai Naw Wun
ca21f48dab add pagination 2020-11-13 02:38:16 +06:30
Sai Naw Wun
08c90fce74 add version text 2020-11-09 05:53:25 +06:30
Thinzar Win
29f3461174 Merge remote-tracking branch 'upstream/master' 2020-11-05 14:22:53 +06:30
Thinzar Win
79745334d1 resolve conflit 2020-11-05 14:22:49 +06:30
e3583b0710 Merge branch 'master' of https://git.mokkon.com/sainw/fcs 2020-10-28 07:10:50 +06:30
Sai Naw Wun
84e8053040 fix shipment list 2020-10-28 07:10:26 +06:30
0100a3058b Merge branch 'master' of https://git.mokkon.com/sainw/fcs 2020-10-28 06:59:02 +06:30
Sai Naw Wun
703a633108 disable cancel invoice in customer 2020-10-28 06:58:45 +06:30
5aee04cc6f Merge branch 'master' of https://git.mokkon.com/sainw/fcs 2020-10-28 06:36:47 +06:30
Sai Naw Wun
fca5b2e8bf disable customer cancel invoice 2020-10-28 06:35:47 +06:30
e88a9938fa Merge branch 'master' of https://git.mokkon.com/sainw/fcs 2020-10-28 06:23:50 +06:30