Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
99,661 Commits 36 Branches 189 Tags
6d049f5c2e018603ec04219fa4586f544952ce60
Commit Graph

24418 Commits

Author SHA1 Message Date
Laurent Destailleur
5d7efcc0d1 Merge pull request #17063 from aspangaro/13p31 
FIX: Periodicity by default on fiscal year, according to the now date, we have plus 1 year added
 2021-04-02 01:53:24 +02:00
Laurent Destailleur
39fc2e6e60 NEW Save old page with .old in edition of a website page 2021-04-01 19:49:36 +02:00
Laurent Destailleur
d4f14183b7 Code comment 2021-04-01 13:15:23 +02:00
Laurent Destailleur
06078f231b NEW Can show the project ref or label into PDF documents 2021-04-01 13:02:44 +02:00
Florian Mortgat
f5617a6247 FIX 13.0 warning - missing quotes around 'label' 2021-04-01 12:33:23 +02:00
Laurent Destailleur
354adbde54 Look and feel v14 2021-04-01 12:27:02 +02:00
Laurent Destailleur
8e14b4d434 FIX #yogosha5775 2021-04-01 11:27:39 +02:00
Alexandre SPANGARO
b5702fcb13 Merge branch '13.0' into 13p31 2021-04-01 04:38:08 +02:00
Alexandre SPANGARO
530b122f1e FIX: Periodicity by default on fiscal year, according to the date, we have plus 1 year added 2021-04-01 04:37:47 +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
5e67427922 Merge pull request #16483 from frederic34/repairToUtf8mb4 
NEW Add experimental repair script to switch to dynamic row format and utf8mb4 encoding
 2021-03-31 22:28:58 +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
Frédéric FRANCE
1823fb34bb Merge remote-tracking branch 'upstream/develop' into repairToUtf8mb4 2021-03-31 18:41:49 +02:00
Laurent Destailleur
2e3af575be Look and feel v14 2021-03-31 18:12:26 +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
Laurent Destailleur
14c7ce7492 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/reception/card.php
 2021-03-31 13:59:21 +02:00
Laurent Destailleur
89dbd745bf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/modAccounting.class.php
 2021-03-31 13:53:36 +02:00
Laurent Destailleur
1880cb92a4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-31 13:47:00 +02:00
Laurent Destailleur
7641f7258b Merge pull request #17044 from aspangaro/14a27 
FIX: Add a sub table to manage accountancy on product/company
 2021-03-31 13:39:17 +02:00
Laurent Destailleur
6aa1229c19 FIX #yogosha5791 2021-03-31 12:44:13 +02:00
Laurent Destailleur
625ade1a53 Clean log 2021-03-31 12:41:44 +02:00
Ferran Marcet
b6faa6b605 FIX: Show Ref.Supplier in LinkToObjectBlock 2021-03-31 09:40:12 +02:00
Alexandre SPANGARO
14a62442c4 FIX: Accountancy - Import in general ledger 2021-03-31 05:07:05 +02:00
Alexandre SPANGARO
9b65529fc7 NEW: Accountancy - Add FEC import 2021-03-31 04:59:12 +02:00
Alexandre SPANGARO
5723dbb836 FIX: Add a sub table to manage accountancy on product/company 2021-03-31 04:52:24 +02:00
Alexandre SPANGARO
38d47c184e FIX: Add a sub table to manage accountancy on product/company 2021-03-30 22:12:57 +02:00
Alexandre SPANGARO
4e30481fa2 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-30 22:05:03 +02:00
Laurent Destailleur
38f1710b43 Merge pull request #17020 from Hystepik/develop#1 
Close #4951 : New module Inventory
 2021-03-30 20:43:52 +02:00
Laurent Destailleur
48f97d77df Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-30 19:35:25 +02:00
Laurent Destailleur
cdd3e385e7 Merge branch 'new-propal-signature-date-and-user' of 
https://github.com/OPEN-DSI/dolibarr into
OPEN-DSI-new-propal-signature-date-and-user

# Conflicts:
#	htdocs/install/mysql/migration/13.0.0-14.0.0.sql
 2021-03-30 19:34:25 +02:00
Laurent Destailleur
78b8af3a4a Merge pull request #17038 from frederic34/patch-3 
fix missing global mod_facture_mars.php
 2021-03-30 19:18:50 +02:00
Laurent Destailleur
32287d8734 Merge pull request #17036 from dolibit-ut/patch-196 
Update box_supplier_orders_awaiting_reception.php
 2021-03-30 19:18:20 +02:00
Laurent Destailleur
d905d2e22d Merge pull request #17035 from dolibit-ut/patch-195 
Update box_accountancy_suspense_account.php
 2021-03-30 19:18:12 +02:00
Frédéric FRANCE
4c874ddf15 Update mod_facture_terre.php 2021-03-30 18:35:46 +02:00
Frédéric FRANCE
a9e720eec3 Update mod_facture_mars.php 2021-03-30 18:33:52 +02:00
UT from dolibit
34077d5b8a Update canvas.class.php 2021-03-30 18:31:36 +02:00
UT from dolibit
479421d923 Update box_supplier_orders_awaiting_reception.php 
https://
 2021-03-30 18:30:07 +02:00
UT from dolibit
0203eab0b0 Update box_accountancy_suspense_account.php 
https://
 2021-03-30 18:28:07 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
Laurent Destailleur
fae3cca494 FIX #yogosha5746 - next step (work in progress) 2021-03-30 17:45:15 +02:00
Laurent Destailleur
9ad3ba1572 Fix regression in export 2021-03-30 17:28:58 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
lmarcouiller
55560b7d38 Inventory module working 2021-03-30 12:35:20 +02:00
Laurent Destailleur
6c98276ead FIX #yogosha5782 2021-03-30 11:26:49 +02:00
Ferran Marcet
b4f638602a FIX: Show Ref.Supplier in LinkToObjectBlock 2021-03-30 11:10:07 +02:00
lvessiller
85fff685db Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-signature-date-and-user 2021-03-30 08:19:54 +02:00
lvessiller
d0ce60ff49 Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-signature-date-and-user 2021-03-30 08:04:19 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00