cheveguerra/Kelloggs_V3
1
0
Fork 0
mirror of https://github.com/KeymonSoft/Kelloggs_V3.git synced 2026-04-22 07:00:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/KeymonSoft/Kelloggs_V3

Browse Source 
# Conflicts:
#	B4A/KelloggsV3.b4a.meta
This commit is contained in:
cvaldes1201
2023-10-27 12:30:34 -06:00
parent 67403c695f d401d75a47
commit 22e2b73f33
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
B4A/B4XMainPage.bas
View File

@@ -5,7 +5,7 @@ Type=Class
Version=9.85 Version=9.85
@EndOfDesignText@ @EndOfDesignText@
#Region Shared Files #Region Shared Files
#CustomBuildAction: folders ready, %WINDIR%\System32\Robocopy.exe,"..\..\Shared Files" "..\Files" '#CustomBuildAction: folders ready, %WINDIR%\System32\Robocopy.exe,"..\..\Shared Files" "..\Files"
'Ctrl + click to sync files: ide://run?file=%WINDIR%\System32\Robocopy.exe&args=..\..\Shared+Files&args=..\Files&FilesSync=True 'Ctrl + click to sync files: ide://run?file=%WINDIR%\System32\Robocopy.exe&args=..\..\Shared+Files&args=..\Files&FilesSync=True
'########################################################################################################### '###########################################################################################################
'###################### PULL ############################################################# '###################### PULL #############################################################
@@ -17,10 +17,22 @@ Version=9.85
'###################### PUSH TORTOISE GIT ######################################################### '###################### PUSH TORTOISE GIT #########################################################
'Ctrl + click ide://run?file=%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe&Args=TortoiseGitProc&Args=/command:commit&Args=/path:"./../../"&Args=/closeonend:2 'Ctrl + click ide://run?file=%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe&Args=TortoiseGitProc&Args=/command:commit&Args=/path:"./../../"&Args=/closeonend:2
'########################################################################################################### '###########################################################################################################
'Ctrl + click to export as zip: ide://run?File=%B4X%\Zipper.jar&Args=Project.zip
#End Region #End Region
'Ctrl + click to export as zip: ide://run?File=%B4X%\Zipper.jar&Args=Project.zip
'GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
'GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
'GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
'GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
'GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
Sub Class_Globals Sub Class_Globals
Private Root As B4XView Private Root As B4XView
Private xui As XUI Private xui As XUI

4
B4A/KelloggsV3.b4a.meta
View File

@@ -82,6 +82,10 @@ ModuleClosedNodes6=
ModuleClosedNodes7= ModuleClosedNodes7=
ModuleClosedNodes8= ModuleClosedNodes8=
ModuleClosedNodes9= ModuleClosedNodes9=
<<<<<<< HEAD
NavigationStack=Diseñador Visual,login.bal,-100,1,Diseñador Visual,principal.bal,-100,1,C_Principal,B4XPage_Created,242,0,C_NoVenta,Class_Globals,0,0,C_Clientes,Class_Globals,0,0,C_Cliente,Class_Globals,291,6,C_Nota,B4XPage_Appear,84,0,C_Nota,ListView1_ItemLongClick,320,0,C_Nota,b_desc_Click,353,0,C_Cliente,B4XPage_Appear,427,6,C_Cliente,B_IMP2_Click,1307,6 NavigationStack=Diseñador Visual,login.bal,-100,1,Diseñador Visual,principal.bal,-100,1,C_Principal,B4XPage_Created,242,0,C_NoVenta,Class_Globals,0,0,C_Clientes,Class_Globals,0,0,C_Cliente,Class_Globals,291,6,C_Nota,B4XPage_Appear,84,0,C_Nota,ListView1_ItemLongClick,320,0,C_Nota,b_desc_Click,353,0,C_Cliente,B4XPage_Appear,427,6,C_Cliente,B_IMP2_Click,1307,6
=======
NavigationStack=Diseñador Visual,mapa_rutas.bal,-100,4,Diseñador Visual,detalle_promo.bal,-100,3,Diseñador Visual,checklist.bal,-100,2,Diseñador Visual,checks.bal,-100,2,MAPA_RUTAS,Activity_Create,72,0,Diseñador Visual,errormanager.bal,-100,3,Diseñador Visual,cliente.bal,-100,1,C_Cliente,GPS_LocationChanged,664,6,Diseñador Visual,principal.bal,-100,6,C_Cliente,B_IMP2_Click,1006,0,C_Productos,HACER_PEDIDO,642,0
>>>>>>> d401d75a47181c01d2e8ebe02bcc19443c71d19a
SelectedBuild=0 SelectedBuild=0
VisibleModules=1,2,3,4,5,6,7,8,9,10,14,11 VisibleModules=1,2,3,4,5,6,7,8,9,10,14,11