Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
87,753 Commits 36 Branches 189 Tags
45f834cb15122c034e1666a03e920f159183d7dd
Commit Graph

1006 Commits

Author SHA1 Message Date
Laurent Destailleur
1e13f6fd0f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/resource/class/dolresource.class.php
	htdocs/resource/list.php
 2020-01-29 11:44:04 +01:00
VESSILLER
8af5d87e80 FIX regex for include or exclude categories in full arbo 2020-01-28 17:13:09 +01:00
Frédéric FRANCE
90235d0528 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-31 13:57:40 +01:00
Laurent Destailleur
07c1a5717e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/facture_situation.php
	htdocs/core/class/html.formother.class.php
 2019-12-23 14:16:34 +01:00
Laurent Destailleur
9a08a6bf6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/categories/traduction.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contact/card.php
	htdocs/core/modules/modSociete.class.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/langs/en_US/products.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php
 2019-12-23 14:13:26 +01:00
VESSILLER
558d577309 FIX add and modify category translate form with posted values on errors 2019-12-23 11:53:19 +01:00
Laurent Destailleur
22b7b69c47 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-22 16:01:32 +01:00
Laurent Destailleur
39737c7c4b Fix opacity on text with a href links inside 
Fix var not defined
 2019-12-22 13:19:14 +01:00
Laurent Destailleur
28a172e80f Merge pull request #9823 from bafbes/abb80035 
NEW:Can change destination of "Back to list" using a "backtolist" parameter
 2019-12-19 10:45:08 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
5012a66ecb Update viewcat.php 2019-12-18 12:29:52 +01:00
Laurent Destailleur
0f5bf891e2 Update viewcat.php 2019-12-18 12:29:16 +01:00
Frédéric FRANCE
307bad1d2a doxygen todo 2019-12-11 19:11:13 +01:00
Frédéric FRANCE
25ed2b930f Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-01 16:10:37 +01:00
Frédéric FRANCE
c214dd0675 Form select_produits returns void 2019-11-28 21:23:53 +01:00
Laurent Destailleur
99906ce127 Fix the root category not used for search from POS 2019-11-28 14:29:58 +01:00
Frédéric FRANCE
b2912e688b Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-27 22:54:05 +01:00
Frédéric FRANCE
5d9d542cd7 Update photos.php 2019-11-25 23:57:10 +01:00
Frédéric FRANCE
2e5f539b2a Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-18 17:45:52 +01:00
Laurent Destailleur
023f359328 Fix php compatibility 2019-11-16 23:28:56 +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
Laurent Destailleur
2689f7515c Fix pb with colspan and extrafields. 
Fix remove empty id
 2019-11-16 14:38:05 +01:00
Frédéric FRANCE
6784ea9fae Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-16 09:21:57 +01:00
Laurent Destailleur
7af6fa199c Merge pull request #12452 from c3do/patch-2 
Implement categorie field ref_ext
 2019-11-16 00:53:28 +01:00
stickler-ci
17667d6a1b Fixing style errors. 2019-11-15 22:08:56 +00:00
Cédric
4332834ff7 Add all types everywhere 2019-11-15 23:08:25 +01:00
Cédric
71a6836588 Implement categorie field ref_ext 2019-11-15 16:12:35 +01:00
stickler-ci
cc6d8f159b Fixing style errors. 2019-11-15 13:47:40 +00:00
Cédric
fa3c63ea28 API New can include childs when get a category 2019-11-15 14:47:08 +01:00
Frédéric FRANCE
6e97697faa wip 2019-11-14 22:38:37 +01:00
Cédric
0c9b4fe16b Add all types 2019-11-14 22:36:16 +01:00
Cédric
0f907fbc29 $type is mandatory 2019-11-14 22:26:15 +01:00
Cédric
100827ae0b Fix error process 2019-11-14 22:16:08 +01:00
Cédric
88692fe95d Doc for $page 2019-11-14 22:00:46 +01:00
stickler-ci
b2d18a8e0c Fixing style errors. 2019-11-14 20:56:31 +00:00
Cédric
837c7276ab API New get categories linked to an object 2019-11-14 21:57:21 +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
Frédéric FRANCE
a3e092b227 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-14 09:21:26 +01:00
Laurent Destailleur
171b94fc5c Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8 Merge pull request #12428 from Dolibarr/scrutinizer-patch-4 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:06 +01:00
Frédéric FRANCE
2ea58b11ca wip 2019-11-13 20:36:32 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:02 +00:00
Frédéric FRANCE
05ab4f79ef categories for actioncomm 2019-11-13 18:44:11 +01:00
Cédric
c4c463fb96 camelCaps 2019-11-13 11:36:42 +01:00
stickler-ci
fcb50841cc Fixing style errors. 2019-11-12 17:10:20 +00:00
Cédric
480ac1a926 API New link/unlink products with categories 
Need it for V11 please :)
 2019-11-12 18:08:09 +01:00
Frédéric FRANCE
35751a80ab 100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
adf5953693 Doc 2019-11-02 15:27:17 +01:00