Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-20 16:31:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
104,562 Commits 36 Branches 190 Tags
c5f3f428672bbf27ffb51a410b58c03b664fae14
Commit Graph

25892 Commits

Author SHA1 Message Date
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
Alexandre SPANGARO
ea6b22f06e FIX: Add a sub table to manage accountancy on product/company 2021-03-30 03:27:46 +02:00
Laurent Destailleur
9edb2fd857 Fix sql error 2021-03-30 02:13:57 +02:00
Laurent Destailleur
b863b2a3f3 Look and feel v14 2021-03-30 02:01:08 +02:00
Laurent Destailleur
c2d583e665 Fix picto 2021-03-30 01:44:50 +02:00
Laurent Destailleur
3616d2ba44 FIX #yogosha5770 2021-03-29 23:24:52 +02:00
Laurent Destailleur
843e0a2c39 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/html.formother.class.php
	htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
	htdocs/projet/tasks/time.php
	htdocs/webservices/server_thirdparty.php
 2021-03-29 21:47:31 +02:00
Laurent Destailleur
2689bc938d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-29 21:40:01 +02:00
Laurent Destailleur
f4ae8af9ea Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
 2021-03-29 21:39:53 +02:00
Laurent Destailleur
6057d8aabd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/login.tpl.php
 2021-03-29 21:37:21 +02:00
Laurent Destailleur
adf15e4e64 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-29 21:04:49 +02:00
Laurent Destailleur
ae0468e107 FIX #yogosha5765 2021-03-29 21:04:33 +02:00
Laurent Destailleur
a4987c6e4f Merge branch 'develop' into 14a22 2021-03-29 20:35:35 +02:00
Florian HENRY
11dcf656c6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-29 20:30:31 +02:00
Laurent Destailleur
5bbfe7ed19 Merge pull request #16930 from aspangaro/14a27 
NEW: Add a sub table to manage accountancy on product/company
 2021-03-29 20:11:02 +02:00
Laurent Destailleur
715490be0b Merge pull request #16929 from aspangaro/14a28 
NEW: Add company info in dropdown login menu
 2021-03-29 19:02:12 +02:00
Laurent Destailleur
a23a2a0119 Merge pull request #16988 from daraelmin/daraelmin-patch-excluded 
Fix #16899 New stuff related to excluded members forgotten during transfer to box graph
 2021-03-29 17:39:58 +02:00
Florian HENRY
14a90a3a9d on goung 2021-03-29 17:26:43 +02:00
Laurent Destailleur
96363b3913 Merge pull request #16974 from ksar-ksar/develop 
FIX #16940
 2021-03-29 17:07:19 +02:00
Florian HENRY
e18c010490 fix bug on list 2021-03-29 16:25:34 +02:00
Florian HENRY
f25360cc4c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-29 15:49:43 +02:00
Laurent Destailleur
3a4bb69c05 FIX #yogosha5749 2021-03-29 15:32:09 +02:00
Laurent Destailleur
ce1f8289a4 FIX #yogosha5746 2021-03-29 15:07:23 +02:00
Laurent Destailleur
e03fbda96a Avoid to obfuscate attributes with html tags inside 2021-03-29 14:50:44 +02:00
Laurent Destailleur
4cacca413e FIX #yogosha5757 2021-03-29 14:43:40 +02:00
Laurent Destailleur
e382d49299 Fix bad permission 2021-03-29 13:49:24 +02:00
Laurent Destailleur
b929641fe1 Look and feel v14 2021-03-29 13:00:17 +02:00