Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
83,748 Commits 36 Branches 189 Tags
7909055ee8cf9419683938d167bbf308fb9415ec
Commit Graph

1209 Commits

Author SHA1 Message Date
Laurent Destailleur
2c477c7169 Fix doxygen 2020-02-20 13:54:41 +01:00
Laurent Destailleur
44eda2d4ad Fix doxygen 2020-02-20 13:42:43 +01:00
Laurent Destailleur
7931734ecb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modUser.class.php
 2020-02-12 20:30:20 +01:00
Thomas
9b0b5f755b Fixed missing trigger on contact delete 2020-02-12 18:24:37 +01:00
Laurent Destailleur
74d3912763 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2020-02-11 16:52:58 +01:00
Laurent Destailleur
9f5f460ae2 Fix field def 2020-02-11 16:42:48 +01:00
Laurent Destailleur
918e570e7a FIX Picture of contact not visible in tooltip 2020-02-10 12:56:08 +01:00
Laurent Destailleur
3a74c3d7e9 Enhance property ->ismulticompanymanaged to define an object with entity 
on its parent.
 2020-02-08 14:40:30 +01:00
Laurent Destailleur
56079f928f Label of field 2020-02-08 11:34:25 +01:00
Laurent Destailleur
cffc56b80b Declaration of property fields of thirdparties 2020-02-08 11:32:38 +01:00
Laurent Destailleur
f752551914 WIP Generic stats page 2020-01-31 14:53:47 +01:00
Laurent Destailleur
27a0858050 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
 2020-01-23 17:41:31 +01:00
Laurent Destailleur
040f8bef5a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/societe/class/societe.class.php
 2020-01-22 16:29:04 +01:00
Laurent Destailleur
381f2d5eee Fix typo 2020-01-22 16:24:16 +01:00
Laurent Destailleur
7964699674 FIX Check on unicity on prof id was not triggered sometimes 2020-01-22 16:22:53 +01:00
Laurent Destailleur
5772dce460 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2020-01-15 12:09:21 +01:00
Laurent Destailleur
b6ed6df75d Remove property tha has no sense in output #12803 2020-01-13 14:14:51 +01:00
Laurent Destailleur
ed2c75a2f8 Merge pull request #12776 from aspangaro/12.0_a4 
NEW Add social networks of the company
 2020-01-13 13:38:16 +01:00
Laurent Destailleur
b47db086cb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/inventory/class/inventory.class.php
	htdocs/product/inventory/list.php
 2020-01-10 14:30:42 +01:00
Laurent Destailleur
d97a59ac4a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	ChangeLog
	htdocs/comm/remise.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
	htdocs/variants/combinations.php
 2020-01-10 14:25:26 +01:00
ptibogxiv
5a1f123994 Update societe.class.php 2020-01-07 13:10:10 +01:00
Laurent Destailleur
b9e0f8999f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2020-01-04 14:03:21 +01:00
Laurent Destailleur
298f6d0683 Look and feel v11 2020-01-02 20:36:35 +01:00
Laurent Destailleur
5cb8cceb82 FIX Do not update timestamp when we set the "default" to another record 2020-01-02 20:29:19 +01:00
Laurent Destailleur
52767c4324 NEW Can enter and edit stripe credit card using the Stripe card ID 2020-01-02 15:45:25 +01:00
Alexandre SPANGARO
9879a43cf4 NEW Add social networks of the company 2019-12-30 21:17:41 +01:00
Laurent Destailleur
4333cf2040 Show the stripe accoutn of a cu_ and a card_ 2019-12-24 12:53:10 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-18 14:20:36 +00:00
Scrutinizer Auto-Fixer
404ae0c209 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-17 02:00:52 +00:00
Laurent Destailleur
95fc14475c Fix show correct stripe publishable_key on payment mode page 2019-12-15 17:32:45 +01:00
Laurent Destailleur
cb71d5a7bb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-15 17:18:21 +01:00
Laurent Destailleur
0ef3de98c6 Try to fix conflict of several stripe accounts 2019-12-15 17:18:09 +01:00
stickler-ci
380b698c6f Fixing style errors. 2019-12-12 16:09:23 +00:00
Anthony Berton
43f150dc42 Update societe.class.php 2019-12-12 17:02:59 +01:00
Frédéric FRANCE
48564ea760 doxygen societe class 2019-12-08 14:26:59 +01:00
Scrutinizer Auto-Fixer
1648fc142e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-16 22:24:29 +00:00
Frédéric FRANCE
fc55123af0 Update api_thirdparties.class.php 2019-11-14 18:31:09 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:15 +00:00
Scrutinizer Auto-Fixer
87585c0f2a Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 17:32:11 +00:00
Laurent Destailleur
c02cd80b75 Clean code 2019-11-12 10:11:30 +01:00
stickler-ci
b892ed05ba Fixing style errors. 2019-11-10 11:17:19 +00:00
Philippe GRAND
d907f36bb6 add some comment 2019-11-10 12:16:51 +01:00
Laurent Destailleur
e885345ef7 FIX Check on duplicate profid was not triggered. 2019-11-06 00:27:36 +01:00
Frédéric FRANCE
872f58f261 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-11-03 21:48:24 +01:00
Laurent Destailleur
c03fabb789 Clean var 2019-11-02 14:26:27 +01:00
Laurent Destailleur
c9a620d1a6 Renamed property of thirdparty "statut_commercial" into 
"status_prospect_label"
 2019-11-02 14:25:52 +01:00
Laurent Destailleur
1cc9954f61 Clean api from bad vars 2019-11-02 14:20:43 +01:00
Laurent Destailleur
25e64b0610 Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
68691ddd8a Merge pull request #12265 from grandoc/new_branch_30_10_2019 
add comment
 2019-11-02 11:49:28 +01:00
stickler-ci
dc97a54d82 Fixing style errors. 2019-11-02 09:39:05 +00:00