lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
72,930 Commits 43 Branches 150 Tags 886 MiB
d9ce99a314
Commit Graph

72930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
e0e298f07b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-17 03:26:15 +01:00
Laurent Destailleur
bf9ee18bed Standardize code. 2018-12-17 03:25:45 +01:00
Laurent Destailleur
71890cbb08 Fix phpcs 2018-12-17 03:14:31 +01:00
torvista
54c56ff069 minor error 2018-12-16 22:15:44 +01:00
torvista
6ce76903a5 removed double quotes as per Travis failure 2018-12-16 21:22:31 +01:00
Laurent Destailleur
3d30d8513f Fix phpcs 2018-12-16 20:36:22 +01:00
Laurent Destailleur
af4405c669 FIX Replenishment with option STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE 2018-12-16 20:29:08 +01:00
Laurent Destailleur
d8b5cd4bdf Remove white lines 2018-12-16 19:31:59 +01:00
Laurent Destailleur
efb88292dd Clean code 2018-12-16 19:30:54 +01:00
andreubisquerra
a53688151d Fix some TakePOS small bugs from last third-party commits 2018-12-16 19:24:49 +01:00
Laurent Destailleur
003c463ee4 FIX Can't delete a line of minimal stock per warehouse 2018-12-16 19:23:53 +01:00
Laurent Destailleur
20d24f2feb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-16 18:45:30 +01:00
Laurent Destailleur
2d05b7c790 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-16 18:45:13 +01:00
Laurent Destailleur
9b844df315 FIX Extrafields on shipment module 2018-12-16 18:44:58 +01:00
torvista
f5d1eea4dc added regions and provinces for Andorra, Hungary, Portugal, Slovenia. 
Spain added postcodes and re-ordered sql in province order to make a logical drop-down picking list.
 2018-12-16 18:28:11 +01:00
Laurent Destailleur
72c5943c55 Execute trigger so we can record line into unalterable log table 2018-12-16 17:53:23 +01:00
Laurent Destailleur
c50646be1c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-16 17:48:15 +01:00
Laurent Destailleur
f1451904c0 Fix phpcs 2018-12-16 17:48:02 +01:00
Laurent Destailleur
ce2d67f225 Fix phpcs 2018-12-16 17:45:51 +01:00
Laurent Destailleur
c06e4ecd68
Merge pull request #10192 from AurelGDN/develop 
New: TakePOS +add Temporary ticket
 2018-12-16 17:44:18 +01:00
Laurent Destailleur
6275355cd5
Merge pull request #10234 from aspangaro/7.0_alert_bank 
Fix: Accountancy - remove alert on bank account configuration when bank account is closed
 2018-12-16 17:41:23 +01:00
Laurent Destailleur
9558020ea3
Merge pull request #10233 from simnandez/8.0 
FIX: Vendor translations are in english
 2018-12-16 17:40:37 +01:00
Laurent Destailleur
e5e4ef7b8c Work on cash fence 2018-12-16 16:47:09 +01:00
Laurent Destailleur
9ce07b9582 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2018-12-16 15:36:18 +01:00
Laurent Destailleur
e366d7d57c Work on cash fence 2018-12-16 15:30:31 +01:00
Laurent Destailleur
988ba172ae Clean code of POS modules 2018-12-16 14:59:51 +01:00
Laurent Destailleur
cde9da57f6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-16 13:39:56 +01:00
Laurent Destailleur
e14b426985 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/exports/export.php
 2018-12-16 13:39:16 +01:00
Laurent Destailleur
cca3b4870a FIX CVE-2018-19799 2018-12-16 13:36:51 +01:00
Laurent Destailleur
4a4bf3273b Experiment disabling of creation of contact+thirdparty with hidden 
option THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION
 2018-12-16 13:22:38 +01:00
Laurent Destailleur
8b718d0cb1 Fix phpcs 2018-12-16 13:01:53 +01:00
Laurent Destailleur
699766223f Fix phpcs 2018-12-16 13:00:24 +01:00
Laurent Destailleur
5dc9b44931 Fix phpcs 2018-12-16 12:59:59 +01:00
Juanjo Menent
a61677dcc6 Merge remote-tracking branch 'upstream/7.0' into 7.0 2018-12-16 11:31:06 +01:00
Juanjo Menent
6ce0d3e279 FIX: Vendor translations are in english 2018-12-16 11:16:12 +01:00
Alexandre SPANGARO
6eb9013430 Fix: Accountancy - remove alert on bank account configuration when bank account is closed 2018-12-16 06:36:55 +01:00
Alexandre SPANGARO
8148ea8361 Revert "Fix: Problem with loan integration in general ledger" 
This reverts commit 50da3c2ed2.
 2018-12-16 06:16:14 +01:00
Alexandre SPANGARO
df8aaf9c06 Merge branch '9.0' of https://github.com/Dolibarr/dolibarr into 9.0 2018-12-16 06:14:55 +01:00
Alexandre SPANGARO
50da3c2ed2 Fix: Problem with loan integration in general ledger 2018-12-16 06:14:33 +01:00
Laurent Destailleur
54a4a54afe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/en_US/banks.lang
 2018-12-15 20:00:31 +01:00
Laurent Destailleur
a601859985 Work on cash fence 2018-12-15 19:58:43 +01:00
Laurent Destailleur
2bfc5fe235 Work on cash fence 2018-12-15 19:56:08 +01:00
Laurent Destailleur
1c49599a47 Work on cash fence feature 2018-12-15 19:46:51 +01:00
Laurent Destailleur
0451eb741b Work on legal cash fence 2018-12-15 19:20:30 +01:00
Laurent Destailleur
85cd23caaf Fix phpcs 2018-12-15 18:31:36 +01:00
Laurent Destailleur
8ce6f67773 Fix phpcs 2018-12-15 18:27:38 +01:00
Laurent Destailleur
54ffba793f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/install/mysql/migration/8.0.0-9.0.0.sql
	htdocs/langs/en_US/admin.lang
 2018-12-15 18:21:37 +01:00
Laurent Destailleur
944f9ac894 Typo 2018-12-15 18:14:08 +01:00
Laurent Destailleur
527ad04ae8 FIX Mandatory field feature should works on textarea 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-12-15 18:13:30 +01:00
Laurent Destailleur
6188156c52 FIX Mandatory field feature should works on textarea 2018-12-15 18:11:40 +01:00