Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
101,561 Commits 36 Branches 189 Tags
b1cba14718f901b459681a56ee7a9f58ffdd18ab
Commit Graph

5891 Commits

Author SHA1 Message Date
stickler-ci
bcab8d5164 Fixing style errors. 2021-04-14 07:49:18 +00:00
Adrien Raze
c83819bd90 NEW : Add possibility to exports userGroups fields on user exports 2021-04-14 09:44:01 +02:00
Alexandre SPANGARO
2f31720896 Maxi debug of societe/product per entity 2021-04-14 04:45:17 +02:00
Laurent Destailleur
033a243372 Merge pull request #17166 from altairisfr/product_masks 
Product masks
 2021-04-13 23:06:09 +02:00
Laurent Destailleur
161baa672a Fix phpcs 2021-04-13 21:11:02 +02:00
Laurent Destailleur
358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
 2021-04-13 20:19:05 +02:00
Laurent Destailleur
192fcb89d2 Merge pull request #17097 from NextGestion/dolibarr_partnership 
Create Partnership Module
 2021-04-13 16:33:54 +02:00
Frédéric FRANCE
d007e75a8e Update pdf_eratosthene.modules.php 2021-04-13 09:55:04 +02:00
Frédéric FRANCE
8085f10995 Update pdf_einstein.modules.php 2021-04-13 09:53:51 +02:00
Frédéric FRANCE
8953c0ac3a Update pdf_cyan.modules.php 2021-04-13 09:49:30 +02:00
Frédéric FRANCE
ee4f846eb9 Update pdf_azur.modules.php 2021-04-13 09:49:03 +02:00
Frédéric FRANCE
fcca5d7d5c Update pdf_sponge.modules.php 2021-04-13 09:47:15 +02:00
Frédéric FRANCE
9ce6d841cc Update pdf_crabe.modules.php 2021-04-13 09:40:16 +02:00
Alexandre SPANGARO
44133166de Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
Damien BENOIT
9abc7a5b0d Update modDataPolicy.class.php 2021-04-12 16:16:48 +02:00
Givriz
7a54e5d346 Using empty instead of isset 
I used empty instead of isset, and I fixed some problems of my previous pull request
 2021-04-12 16:03:56 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
altairis-noe
ab39cfdf09 oops, better if we test the right const 2021-04-12 14:32:05 +02:00
altairis-noe
beecc6f935 Merge branch 'product_masks' of github.com:altairisfr/dolibarr into product_masks 2021-04-12 14:13:37 +02:00
altairis-noe
a61c1f8807 checkboxes for custom masks 2021-04-12 14:01:36 +02:00
Alexandre SPANGARO
f749111148 Work on split module fournisseur 2021-04-12 06:27:46 +02:00
Alexandre SPANGARO
ab35b6b4f2 Work on split module fournisseur 2021-04-12 06:21:25 +02:00
Alexandre SPANGARO
77d751b03e Work on split module fournisseur 2021-04-12 05:41:37 +02:00
Alexandre SPANGARO
ce7c5a0c7b Work on split module fournisseur 2021-04-11 04:24:21 +02:00
Laurent Destailleur
3895142772 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2021-04-10 12:06:11 +02:00
Laurent Destailleur
52213d0ac7 Fix duplicate permissions 2021-04-09 21:15:43 +02:00
NextGestion
d6e4cb7d0b Merge branch 'develop' into dolibarr_partnership 2021-04-09 12:01:44 +01:00
Laurent Destailleur
d098bf412d Move directory to match the one of composer package for phpspreadsheet 2021-04-08 17:35:52 +02:00
Laurent Destailleur
244e83e18d Merge pull request #17164 from draceo/art261-7 
Add bill tax code article for non profit organization VAT (fixes #17163)
 2021-04-08 13:46:22 +02:00
Laurent Destailleur
1e1b963ca7 Restriction on name of files 2021-04-07 19:38:54 +02:00
Florent Peyraud
7be9a98ef0 Add bill tax code article for non profit organization VAT 2021-04-07 13:51:08 +02:00
NextGestion
ace958240d Merge branch 'develop' into dolibarr_partnership 2021-04-07 12:30:37 +01:00
stickler-ci
c9aed75837 Fixing style errors. 2021-04-07 11:24:31 +00:00
NextGestion
5f5f0eb3f3 Add menu entries into thirdparty menu or member menu & Allow extrafields 2021-04-07 12:21:59 +01:00
Laurent Destailleur
fcc6431896 Merge pull request #17136 from aspangaro/14a35 
NEW: Add deposit on supplier invoice (& somes ajustments)
 2021-04-07 02:51:32 +02:00
NextGestion
78b4aa61fa Add a new tab "Partnership" on the record of a thirdparty or a member (depending on setup) 2021-04-06 18:57:45 +01:00
NextGestion
debef2fb6d initial Batch to cancel partnership for expired members 2021-04-06 15:53:51 +01:00
Alexandre SPANGARO
36e4f5aa22 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-06 10:29:44 +02:00
Alexandre SPANGARO
82b652df8a NEW: Add deposit on supplier invoice (& somes ajustments) 2021-04-06 09:15:34 +02:00
Laurent Destailleur
685c880e6c Debug module workstation 2021-04-05 14:56:47 +02:00
Laurent Destailleur
6c521073ea Fix perm id and sort of modules by id. 2021-04-05 13:52:19 +02:00
Alexandre SPANGARO
f64d0377c5 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-04 06:03:41 +02:00
Givriz
5ed01f6733 Fix errors phpv8 2021-04-03 17:09:14 +02:00
NextGestion
6cac5f2212 Create Partnership Module 2021-04-03 09:24:07 +01:00
Laurent Destailleur
06078f231b NEW Can show the project ref or label into PDF documents 2021-04-01 13:02:44 +02:00
Laurent Destailleur
6fc70fba8c Merge pull request #16981 from FHenry/dev_EventOrganisation 
new: working on conference or booth object and event type #FoundationFunding
 2021-03-31 22:29:39 +02:00
Laurent Destailleur
55741506c8 Merge pull request #17053 from aspangaro/14a30 
NEW: Accountancy - Add FEC import
 2021-03-31 22:15:26 +02:00
Alexandre SPANGARO
dd913b2385 Update 2021-03-31 20:40:26 +02:00
Florian HENRY
73d7eefdcf Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-31 20:09:44 +02:00
Laurent Destailleur
b695c4a1c8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-31 13:59:35 +02:00