Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
79,034 Commits 36 Branches 189 Tags
fec67aade476d54d96db49b200bf53e0927e5eb0
Commit Graph

4945 Commits

Author SHA1 Message Date
ptibogxiv
869e497a48 NEW : Platforme compliance with Stripe Connect 2019-08-21 16:41:36 +02:00
Laurent Destailleur
23b1c24bf7 Fix template 2019-08-16 06:28:25 +02:00
Laurent Destailleur
5d1bfdaa29 Merge pull request #11678 from atm-greg/develop_fk_projet_on_stock_movement 
NEW Add fk projet on stock movement
 2019-08-15 19:27:06 +02:00
Laurent Destailleur
14030affe5 Update website templates 2019-08-15 02:57:00 +02:00
Laurent Destailleur
bb35d9be0c Fix copy of templates during activation of module 2019-08-15 01:50:01 +02:00
Laurent Destailleur
f81463af0c Update templates 2019-08-15 00:55:47 +02:00
Laurent Destailleur
dfe2c3de74 Add template stellar 2019-08-15 00:31:37 +02:00
Laurent Destailleur
f753799810 FIX Support #tag into url of website module 2019-08-14 23:27:34 +02:00
Laurent Destailleur
bb4618e2cf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/website.lib.php
	htdocs/website/index.php
 2019-08-14 04:12:37 +02:00
Laurent Destailleur
77c96a49e1 Update website template 2019-08-13 04:53:47 +02:00
Laurent Destailleur
8ad2081555 NEW Can select website templates from available default templates 2019-08-12 22:19:24 +02:00
atm-greg
7c136e77ec bad migration file 2019-08-12 15:18:40 +02:00
atm-greg
f8ad8d72c0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_fk_projet_on_stock_movement 2019-08-12 15:16:43 +02:00
atm-greg
acdf13d769 add fk_projet on stock movements 2019-08-12 15:08:15 +02:00
Laurent Destailleur
86d39b435b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-12 02:42:11 +02:00
Laurent Destailleur
5ca988b3d2 Fix position of requests 2019-08-12 02:36:15 +02:00
Frédéric FRANCE
d55377981c Update 10.0.0-11.0.0.sql 2019-08-07 13:27:55 +02:00
Frédéric FRANCE
28100f67ac Update llx_c_price_expression.sql 2019-08-07 13:25:14 +02:00
Laurent Destailleur
f8e19beb5a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 18:30:59 +02:00
Laurent Destailleur
808d6ba389 Fix phpcs 2019-08-01 18:30:39 +02:00
Laurent Destailleur
85dbec6ae7 Move sql in correct migration file 2019-08-01 16:33:34 +02:00
Laurent Destailleur
25725a5a6a Merge pull request #11615 from ptibogxiv/patch-202 
Fix wrong sql update version retained_warranty
 2019-08-01 16:32:00 +02:00
Laurent Destailleur
3d8f6dca76 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 16:30:32 +02:00
ptibogxiv
ace01f7442 Fix wrong sql update version 2019-08-01 16:29:42 +02:00
Laurent Destailleur
6693f9fbca Fix phpcs 2019-08-01 16:24:19 +02:00
Laurent Destailleur
a7390e7e47 Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop 
NEW Management of retained warranty on situation invoices
 2019-07-30 21:53:09 +02:00
Laurent Destailleur
34f78c555d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-30 20:55:35 +02:00
Laurent Destailleur
192fb45ce7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/adherents/card.php
	htdocs/compta/sociales/list.php
	htdocs/compta/sociales/payments.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/holiday/class/holiday.class.php
	htdocs/viewimage.php
 2019-07-30 20:55:15 +02:00
Laurent Destailleur
5f2439bf0a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-30 20:37:44 +02:00
Florian Mortgat
de293c4ef2 FIX issue #9300: install error with PostgreSQL when using custom table prefix 2019-07-30 14:09:03 +02:00
Laurent Destailleur
9f7d118f6f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-27 02:40:56 +02:00
Laurent Destailleur
3a740313fe Merge branch '10.0' into 10.0 2019-07-25 18:31:26 +02:00
Laurent Destailleur
a46bfc7a29 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2019-07-25 17:54:14 +02:00
Laurent Destailleur
e88ca8ae89 Fix migration 2019-07-25 15:07:24 +02:00
Laurent Destailleur
4833c2bf49 Merge 2019-07-22 18:50:17 +02:00
Laurent Destailleur
f5afc50067 Merge branch '11.0_salaries' of https://github.com/aspangaro/dolibarr into aspangaro-11.0_salaries 2019-07-22 18:47:35 +02:00
Laurent Destailleur
a379d7804c Merge pull request #11535 from aspangaro/11.0_p1 
QUAL Move ligne.php to line.php
 2019-07-22 18:33:06 +02:00
jcp
cfaf9ce0ea SET special_code=4 for existing records 2019-07-22 11:44:18 +02:00
Laurent Destailleur
5d1a50bcb4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-20 14:03:18 +02:00
Laurent Destailleur
ac8a776113 FIX Column 'paid' missing in expense report 2019-07-20 14:02:53 +02:00
Laurent Destailleur
826851e1a9 Fix migration 2019-07-20 14:01:00 +02:00
Laurent Destailleur
865ebb9de2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/ticket/class/ticket.class.php
 2019-07-20 13:29:10 +02:00
Alexandre SPANGARO
5f042cf6ad QUAL Move ligne.php to line.php 2019-07-19 23:19:06 +02:00
Alexandre SPANGARO
0af1206892 Merge branch 'develop' into 11.0_salaries 2019-07-19 23:11:06 +02:00
Alexandre SPANGARO
9ab0734415 NEW Extrafields on salaries 2019-07-19 23:08:24 +02:00
Laurent Destailleur
fafb7956de Fix position of triggers 2019-07-19 18:52:44 +02:00
Laurent Destailleur
a55da8f8f8 Fix migration 2019-07-19 17:20:33 +02:00
Alexandre SPANGARO
21bd46fc15 Merge remote-tracking branch 'upstream/develop' into 11.0_salaries 2019-07-17 14:09:46 +02:00
Alexandre SPANGARO
79d8351dda NEW Extrafields on salaries 2019-07-17 14:09:25 +02:00
Laurent Destailleur
fed598236c Add field 2019-07-17 01:12:48 +02:00