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

67465 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ca5f27636b
Merge pull request #8978 from grandoc/new_branch_17_06_2018 
clean and update code
 2018-06-18 11:16:00 +02:00
Laurent Destailleur
9d048281dc
Merge pull request #8970 from inoveaconseil/FixParamGenerateDocument 
Fix missing params on generateDocument
 2018-06-18 11:14:49 +02:00
Laurent Destailleur
5d56969bd9
Merge pull request #8977 from hythamsoliman81/dolibarr-fixes 
FIX: SQL syntax error at llx_website_page.sql
 2018-06-18 10:41:45 +02:00
Philippe GRAND
ddbf5e59e1 clean and update code 2018-06-18 10:12:19 +02:00
Philippe GRAND
4c08e2ebf3 clean and update code 2018-06-17 14:33:29 +02:00
Laurent Destailleur
118d22cf1e Fix date format 2018-06-17 12:07:11 +02:00
Laurent Destailleur
7c7ee56832 Fix missing email 
Fix avoid warning
 2018-06-17 01:50:10 +02:00
hythamsoliman81
f461ab5f96 SQL synatx error at llx_website_page.sql 2018-06-17 00:12:06 +02:00
hythamsoliman81
8e6137171a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2018-06-16 23:55:18 +02:00
Laurent Destailleur
dcd43b715a Fix look and feel v8 2018-06-16 23:51:30 +02:00
Hytham Soliman
0374a1d0bc
Merge pull request #2 from Dolibarr/develop 
Fix CSS
 2018-06-16 21:46:07 +02:00
Laurent Destailleur
187127ce6f Fix CSS 2018-06-16 21:19:50 +02:00
Hytham Soliman
fb772e8cc0
Merge pull request #1 from Dolibarr/develop 
update my fork 2018-06-16
 2018-06-16 18:17:22 +02:00
Laurent Destailleur
8c748505db Use parent instead of parents 2018-06-16 17:25:16 +02:00
Laurent Destailleur
7ad086bbdf FIX Duplicate select2 when we split a supplier order receipt item 2018-06-16 17:18:17 +02:00
Laurent Destailleur
5524784421 FIX prefilled date of order must have hours too 2018-06-16 15:24:31 +02:00
Laurent Destailleur
186f08e67b Fix preview of PDF for supplier objects 2018-06-16 15:08:13 +02:00
Laurent Destailleur
7981bd08b7 Fix price+sql error when adding product when no supplier price defined 2018-06-16 14:47:33 +02:00
Laurent Destailleur
4898f10fa2 FIX Adding a product with no supplier price defined yet 2018-06-16 13:49:28 +02:00
Laurent Destailleur
92952aea28 Trans 2018-06-16 13:23:58 +02:00
Laurent Destailleur
5908fc1471 Trans 2018-06-16 13:15:24 +02:00
Laurent Destailleur
c0d4715bdb Clean code 2018-06-15 16:29:26 +02:00
Laurent Destailleur
79cbdf7fd1 Code comment 2018-06-15 15:29:19 +02:00
Inovea Conseil
d5a3e63e05 Fix missing paramater for generateDocument 2018-06-15 09:47:28 +02:00
Inovea Conseil
259c8ed60d Merge remote-tracking branch 'Dolibarr/develop' into develop 2018-06-15 09:02:22 +02:00
Laurent Destailleur
df28be443b Add syslog module in list of module reloaded in last migration step 2018-06-14 23:00:42 +02:00
Laurent Destailleur
f5c08c4b9f Doc website 2018-06-14 16:38:20 +02:00
Laurent Destailleur
25d656025a Fix use of alternative aliases is ok now 2018-06-14 16:33:11 +02:00
Laurent Destailleur
b37f7a6953 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-14 16:15:34 +02:00
Laurent Destailleur
e28aca6244 Fix workaround against p insertion by ckeditor 2018-06-14 16:15:06 +02:00
Laurent Destailleur
bb6b27a206
Merge pull request #8959 from frederic34/backquote 
remove back quote in llx_accounting_account_de.sql
 2018-06-14 12:03:02 +02:00
Laurent Destailleur
9717a32a2e
Merge pull request #8960 from grandoc/new_branch_13_06_2018 
clean code
 2018-06-14 12:01:19 +02:00
Laurent Destailleur
f79466d483 Trans 2018-06-14 11:41:14 +02:00
Laurent Destailleur
4900f1f1f1 Fix sql coding style 2018-06-13 23:10:29 +02:00
Laurent Destailleur
910652eb6d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang
 2018-06-13 23:07:30 +02:00
Laurent Destailleur
4c2af6fc70 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/html.form.class.php
 2018-06-13 23:04:08 +02:00
Laurent Destailleur
a15cfd23f0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-13 22:57:51 +02:00
Laurent Destailleur
4a5fd35e11 Look and feel v8 2018-06-13 22:57:41 +02:00
Philippe GRAND
a937d9e657 clean code 2018-06-13 22:52:24 +02:00
Frédéric FRANCE
1bb25c6ce4
remove back quote 2018-06-13 22:26:12 +02:00
Laurent Destailleur
c5887c1ec7
Merge pull request #8399 from ptibogxiv/patch-23 
FIX lang for support more type of stripeconnect account
 2018-06-13 22:13:43 +02:00
Laurent Destailleur
094b31a563 Complete migration 2018-06-13 21:46:55 +02:00
Laurent Destailleur
ed41731a50
Merge pull request #8954 from mwelters/develop 
German Accounting Plan SKR03 and SKR04 (mysql/data)
 2018-06-13 21:45:02 +02:00
Laurent Destailleur
c09e69aeb6
Update llx_accounting_abc.sql 2018-06-13 21:44:43 +02:00
Laurent Destailleur
8d1456fb7f
Merge pull request #8949 from atm-greg/Manage_product_units_in_supplier_proposal 
add product units management in supplier proposal documents
 2018-06-13 21:41:39 +02:00
Laurent Destailleur
aaa6565014
Merge pull request #8938 from HackLo/develop 
FIX: Link does not work when there is spaces in SIREN
 2018-06-13 21:39:54 +02:00
Laurent Destailleur
6881fda744
Merge pull request #8934 from grandoc/new_branch_08_06_2018 
New branch 08 06 2018
 2018-06-13 21:38:46 +02:00
Laurent Destailleur
074ada10e6
Merge pull request #8940 from aspangaro/8.0-b33 
Fix : Migration for Romanian chart of accounts
 2018-06-13 21:37:50 +02:00
Laurent Destailleur
09c92b7cc8
Merge pull request #8936 from atm-gauthier/6.0_fix_dont_remove_all_fourn_rights 
FIX : If we enable 3 steps for supplier order approbation, we must no…
 2018-06-13 21:36:01 +02:00
Laurent Destailleur
bc0080b945
Merge pull request #8945 from bafbes/abb7009 
Fix: Do not activate module if errors found on execution of module SQL queries
 2018-06-13 21:28:04 +02:00