Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 02:58:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
61,474 Commits 36 Branches 190 Tags
5e34b121dd0445c908f37fa42e901b7af025dcaa
Commit Graph

3821 Commits

Author SHA1 Message Date
Laurent Destailleur
cffb368bbd Merge pull request #7030 from aspangaro/6.0-fec3 
Fix : Accountancy - Debug and add information in database
 2017-06-19 15:02:30 +02:00
Laurent Destailleur
caf48f32c4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-19 03:01:01 +02:00
Laurent Destailleur
43f25b49a1 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-06-19 03:00:29 +02:00
Laurent Destailleur
5cd5986211 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-06-19 02:59:49 +02:00
Laurent Destailleur
39419bb411 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2017-06-19 02:59:16 +02:00
Laurent Destailleur
774c624687 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8 2017-06-19 02:58:44 +02:00
Laurent Destailleur
52eeeebac9 Fix bad data in sql dump 2017-06-19 02:57:49 +02:00
Laurent Destailleur
5439390461 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7 2017-06-19 02:57:12 +02:00
Laurent Destailleur
6fc4dacd42 Fix migration opensurvey 2017-06-19 02:55:33 +02:00
Laurent Destailleur
8d84277e8c Complete repair script 2017-06-19 02:18:04 +02:00
Alexandre SPANGARO
e9b6afd2aa Add last session coding - Add temporaly ledger 2017-06-18 22:17:32 +02:00
Laurent Destailleur
0482137620 Fix warning 2017-06-17 18:03:53 +02:00
Laurent Destailleur
81f1a34112 Revert "Fix SPEC #7013 : use database type "numeric" to store monetary values" 2017-06-16 13:06:35 +02:00
Laurent Destailleur
549bb2c55f Merge pull request #7020 from aspangaro/7.0-1 
Fix SPEC #7013 : use database type "numeric" to store monetary values
 2017-06-16 12:59:52 +02:00
Laurent Destailleur
e813fd2dfa Fix missing key import_key and extraparams 2017-06-16 12:57:30 +02:00
Alexandre SPANGARO
f424f96589 Fix SPEC #7013 : use database type "numeric" to store monetary values 2017-06-16 05:15:00 +02:00
Laurent Destailleur
8b7ca1f280 Fix missing vat_src_code into table of expense report 2017-06-15 21:27:20 +02:00
Laurent Destailleur
097be322a6 Modify code to match new v6 structure. 2017-06-15 19:29:00 +02:00
Laurent Destailleur
71c0be20b9 Change data structure for bookkeeping v6 2017-06-15 10:30:32 +02:00
Laurent Destailleur
b889db997a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/datepicker.php
	htdocs/core/get_menudiv.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/search_page.php
	htdocs/main.inc.php
	htdocs/master.inc.php
	htdocs/product/list.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
	htdocs/user/card.php
	htdocs/user/index.php
 2017-06-14 10:48:34 +02:00
Laurent Destailleur
7939daa225 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
	htdocs/user/index.php
 2017-06-14 10:18:24 +02:00
Laurent Destailleur
ecf29332f3 Merge pull request #6989 from atm-alexis/NEW_blocklog_develop_refactor 
NEW Blokedlog stuff
 2017-06-12 17:44:27 +02:00
Alexis Algoud
0312d2479d add block info popin, translation, hidden authority feature 2017-06-12 10:26:24 +02:00
Laurent Destailleur
b80ee49032 Add missing currency for bengladesh 2017-06-11 19:27:21 +02:00
Laurent Destailleur
ca324346e4 Update doc 2017-06-11 19:08:40 +02:00
Laurent Destailleur
5471170a97 Merge pull request #6969 from atm-alexis/NEW_blocklog_develop_refactor 
NEW blockedlog hash and authority
 2017-06-11 15:54:47 +02:00
Alexis Algoud
11d2a5538b fix entity default value and add link to download blockchain 2017-06-11 00:03:01 +02:00
Laurent Destailleur
542a72c684 NEW custom dir is enabled dy default on first install. 
Fix modulebuilder when custom dir not defined.
 2017-06-10 23:50:46 +02:00
Laurent Destailleur
acfaec684d FIX CVE-2017-7888 2017-06-10 22:31:22 +02:00
Laurent Destailleur
36b18f0300 Save MAIN_VERSION_FIRST_INSTALL that is not erased. 2017-06-10 22:11:12 +02:00
Laurent Destailleur
9c482b9f2a FIX CVE-2017-7886 2017-06-10 21:37:27 +02:00
Alexis Algoud
63b3010c2e fix sql 2017-06-10 09:28:07 +02:00
Alexis Algoud
3d5899edf3 final blockedlog init 2017-06-10 09:25:32 +02:00
Laurent Destailleur
811b0d9af4 Fix missing thumbs images for products 2017-06-09 00:27:44 +02:00
alexis Algoud
9b3b2e600f init blockedlog trigger and hash store 2017-06-08 17:52:02 +02:00
Laurent Destailleur
a1144e1f66 Fix missing init of hookmanager 2017-06-08 11:18:41 +02:00
Regis Houssin
bb37c2f980 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_transverse
 2017-06-06 13:54:33 +02:00
Laurent Destailleur
4bda7fcafc Merge pull request #6949 from aspangaro/6.0-vat2 
NEW : VAT payment v6 look and feel
 2017-06-06 11:08:50 +02:00
Regis Houssin
7ed0643b52 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse 2017-06-06 10:54:16 +02:00
Laurent Destailleur
c50006c91b Merge pull request #6936 from aspangaro/6.0-multijournal 
Accountancy - Activate multijournal on bank_journal
 2017-06-06 10:38:05 +02:00
Regis Houssin
79a0b959d1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse 2017-06-06 10:36:37 +02:00
Regis Houssin
b66da3d148 New: big refactorization of multicompany transverse mode 2017-06-06 10:23:33 +02:00
Laurent Destailleur
22efbabfa6 NEW Add hook doUpgrade2 2017-06-06 01:34:25 +02:00
Alexandre SPANGARO
e547aa8aee NEW : VAT payment v6 look and feel 2017-06-05 15:41:33 +02:00
Alexandre SPANGARO
806d25ae41 Activate multi-journal on expensereport journal 2017-06-05 06:44:53 +02:00
Alexandre SPANGARO
ef9275d031 Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal 
# Conflicts:
#	htdocs/core/menus/standard/eldy.lib.php
 2017-06-03 07:48:50 +02:00
Alexandre SPANGARO
90c1a38486 Accountancy - Activate multijournal on bank_journal 2017-06-03 07:23:14 +02:00
Laurent Destailleur
504ea85334 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-03 01:55:27 +02:00
Laurent Destailleur
7f18dfee0d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/skeletons/build_class_from_table.php
	dev/skeletons/skeleton_card.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/projet/card.php
 2017-06-03 01:55:05 +02:00
Laurent Destailleur
af01e544d5 Merge branch 'develop' into fix_develop_missing_entity_column 2017-06-03 01:11:49 +02:00