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
Frédéric FRANCE
a2fc7ce8c9 doxygen 2020-11-14 20:37:54 +01:00
Frédéric FRANCE
50e3fffbd8 doxygen 2020-11-14 20:35:52 +01:00
Frédéric FRANCE
d5f93e8c35 Update pdf_typhon.modules.php 2020-11-14 20:26:13 +01:00
Frédéric FRANCE
61d72b53be doxygen 2020-11-14 20:24:26 +01:00
Frédéric FRANCE
30f89b1216 doxygen 2020-11-14 18:37:05 +01:00
Frédéric FRANCE
0a5e041775 Merge remote-tracking branch 'upstream/develop' into odtformembers 2020-11-14 00:56:21 +01:00
Frédéric FRANCE
4ca3c0aa95 Add odt for members 2020-11-14 00:48:13 +01:00
Laurent Destailleur
8970fbca79 Merge pull request #15397 from frederic34/patch-19 
can upload odt model for user
 2020-11-14 00:39:44 +01:00
Frédéric FRANCE
70f1ed53f8 can upload odt model for user 2020-11-13 22:51:10 +01:00
Frédéric FRANCE
2f3ff6628d The variable $obj does not seem to be defined 
The variable $obj does not seem to be defined for all execution paths leading up to this point.
 2020-11-13 20:51:48 +01:00
Laurent Destailleur
86481d16d0 Clean code 2020-11-13 15:02:49 +01:00
Laurent Destailleur
6d4d3c618d FIX #15369 and standardize permission "readall" 2020-11-13 09:55:53 +01:00
Laurent Destailleur
754a9778ea Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/modUser.class.php
 2020-11-12 14:17:10 +01:00
Laurent Destailleur
0764cb2abd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-12 14:13:19 +01:00
Laurent Destailleur
02158928cc FIX #15365 export of extrafields for user and resources 2020-11-12 14:11:59 +01:00
Laurent Destailleur
a168c3fbb1 Remove warnings 2020-11-12 12:33:29 +01:00
Laurent Destailleur
576e1e1de8 Fix pdf crabe 2020-11-11 23:42:24 +01:00
andreubisquerra
d6b5168d12 NEW Receipt Printer module as stable 
I want to propose in the canceled devcamp to set this module as stable. I will present the new TakePOS connector in the devcamp too, and requires this module. What a pity, the devcamp was canceled.
 2020-11-10 22:19:46 +01:00
quentin
fb27c98f9c FIX : handling $heightforinfotot when he's superior to a page height 2020-11-10 09:40:45 +01:00
Scrutinizer Auto-Fixer
f6e3f58fcb Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-11-09 14:18:56 +00:00
Laurent Destailleur
451432d73c Merge pull request #15139 from dvdwalker/develop 
Update to allow importing extrafileds on Product Supplier Price
 2020-11-08 12:40:53 +01:00
Laurent Destailleur
ea4ad24ac5 Fix doc 2020-11-07 02:14:17 +01:00
Laurent Destailleur
1d9aacc7da Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commoninvoice.class.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
 2020-11-05 09:51:28 +01:00
jcp
bae05bbe7d Fix computed import 2020-11-03 18:43:03 +01:00
Frédéric FRANCE
0299d0c9cc doxygen 2020-11-02 10:50:54 +01:00
Laurent Destailleur
1c15ec9dec Merge pull request #15258 from frederic34/patch-13 
Update mod_codeclient_elephant.php
 2020-11-02 09:32:08 +01:00
Frédéric FRANCE
802efbe6a7 Update mod_codeclient_elephant.php 2020-11-01 23:30:15 +01:00
Frédéric FRANCE
1ccb5cb2d7 Update mod_codeclient_elephant.php 2020-11-01 23:09:30 +01:00
Frédéric FRANCE
c973faf9a9 Update mod_codeclient_elephant.php 2020-11-01 23:06:35 +01:00
Frédéric FRANCE
cd61e5b0b2 Update modules_societe.class.php 2020-11-01 22:44:09 +01:00
Laurent Destailleur
d6b6cacbe5 Removed warning 2020-11-01 20:02:12 +01:00
Laurent Destailleur
e0ed89c514 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/compta/facture/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/product/class/product.class.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
 2020-11-01 17:58:41 +01:00
Laurent Destailleur
72160deef7 FIX #14979 2020-11-01 17:01:26 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
dvdwalker
d4d7e85805 Update modProduct.class.php 2020-10-30 08:19:28 -03:00
Laurent Destailleur
ec0c8e0c79 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/tpl/advtarget.tpl.php
 2020-10-30 03:35:40 +01:00
Laurent Destailleur
263b679af4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/tpl/advtarget.tpl.php
 2020-10-30 03:31:04 +01:00
Scrutinizer Auto-Fixer
208740c9c4 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-28 16:49:52 +00:00
Scrutinizer Auto-Fixer
a2a9c51e50 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-27 18:46:07 +00:00
Laurent Destailleur
ec6c735d89 Clean code 2020-10-27 19:44:15 +01:00
Laurent Destailleur
f7de9333bb Doxygen 2020-10-27 19:29:42 +01:00
Alfredo Altamirano
1b82b6af4d FIX #15111 Fix special characters output in PDF 2020-10-25 22:17:02 -06:00
Laurent Destailleur
8578a7cd7c Fix regressions 2020-10-25 17:02:25 +01:00
Laurent Destailleur
cd4d738a56 Merge branch 'translateModLivraison2ModDelivery' of 
https://github.com/orebd/dolibarr into develop

# Conflicts:
#	htdocs/install/mysql/migration/12.0.0-13.0.0.sql
 2020-10-25 16:01:18 +01:00
Laurent Destailleur
4d9c8e2225 Merge pull request #15124 from frederic34/retrieve 
retrieve the spelling
 2020-10-25 14:48:51 +01:00
dvdwalker
8b91b5527a Update to allow importing extrafileds on Product Supplier Price 2020-10-24 11:13:44 -03:00
Frédéric FRANCE
96e80f116a fix unknown property db 2020-10-23 22:06:23 +02:00
Frédéric FRANCE
ae3228b9e0 retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Frédéric FRANCE
9a470fa42d replace deprecated 2020-10-22 22:50:03 +02:00