Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
72,480 Commits 36 Branches 189 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

3686 Commits

Author SHA1 Message Date
Laurent Destailleur
f9e99e93c3 Fux utf8 trouble on direct printing message 2017-11-27 14:34:29 +01:00
Laurent Destailleur
43c60ec224 Fix error management at wrong place 2017-11-27 13:45:59 +01:00
Laurent Destailleur
7ea96d53a2 Minor fixes 2017-11-24 18:12:01 +01:00
Laurent Destailleur
63d2d38c5f Fix export stock with lot 2017-11-24 17:47:40 +01:00
Laurent Destailleur
8659d97e97 Fix export of lot must use properties of lot from product_lot 2017-11-24 17:44:19 +01:00
Laurent Destailleur
0370368d04 Restore lost field during merge 2017-11-24 16:46:50 +01:00
Laurent Destailleur
d7f5f14f46 Merge branch 'develop' into new_export_stock_valo 2017-11-24 16:40:36 +01:00
Laurent Destailleur
aa2397ff1d Merge pull request #7859 from vvnt/patch-9 
modPropale.class.php permissions in English
 2017-11-24 16:34:02 +01:00
Laurent Destailleur
8bd2707678 Merge pull request #7858 from vvnt/patch-8 
modFacture.class.php permissions in English
 2017-11-24 16:33:42 +01:00
Laurent Destailleur
a18824050c Merge pull request #7857 from vvnt/patch-7 
modSociete.class.php permissions in English
 2017-11-24 16:33:22 +01:00
Laurent Destailleur
438a68968f Fix regression 2017-11-24 16:28:24 +01:00
Maxime Kohlhaas
cad2fedf70 New add pmp and cost price in product stock export 2017-11-23 18:41:48 +01:00
Laurent Destailleur
b93e35cdd2 Fix a lot of request to use the IN getentity instead of = 
Fix a lot of request to use left join on type of payment table
 2017-11-23 15:06:16 +01:00
Laurent Destailleur
295b4483d4 Enhance the repair.php tool 2017-11-23 13:23:16 +01:00
vvnt
09f4abd38e modPropale.class.php permissions in English 2017-11-22 23:22:43 +01:00
vvnt
10ba9a2fee modFacture.class.php permissions in English 2017-11-22 23:16:15 +01:00
vvnt
1b646f755d modSociete.class.php permissions in English 2017-11-22 23:11:36 +01:00
Laurent Destailleur
5fa8db1650 Work on timesheets 2017-11-22 21:19:40 +01:00
Laurent Destailleur
d2b3fc5813 Merge pull request #7849 from IonAgorria/resources-card 
NEW: Merge resource/add.php to resource/card.php
 2017-11-22 11:33:56 +01:00
Laurent Destailleur
30d0c4f210 Merge pull request #7845 from vvnt/patch-6 
modSociete.class.php (spelling correction)
 2017-11-22 11:33:03 +01:00
Laurent Destailleur
918a51b9da Merge pull request #7844 from vvnt/patch-5 
modPropale.class.php (spelling correction)
 2017-11-22 11:28:25 +01:00
Ion
7c6622f5b3 Merge resource/add.php to resource/card.php 2017-11-21 20:12:55 +01:00
vvnt
c74eef03dd modSociete.class.php (spelling correction) 
Minor spelling correction.
 2017-11-21 15:17:02 +01:00
vvnt
005be3f69b modPropale.class.php (spelling correction) 
Minor spelling correction
 2017-11-21 15:13:13 +01:00
vvnt
98998a7060 Update modFacture.class.php 2017-11-21 15:07:53 +01:00
Laurent Destailleur
7349b5d793 Fix php 7.2 2017-11-17 17:23:56 +01:00
Laurent Destailleur
2705030006 Code comment 2017-11-17 15:34:15 +01:00
Laurent Destailleur
2cb190fc5c Fix return code 2017-11-17 15:27:59 +01:00
Laurent Destailleur
c527189088 Standardize page name 2017-11-16 12:18:25 +01:00
Laurent Destailleur
c85acbfc11 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/install/repair.php
 2017-11-14 19:47:33 +01:00
Laurent Destailleur
a2c80a704f Code comment 2017-11-13 19:06:58 +01:00
Laurent Destailleur
f33182acc5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-12 20:49:53 +01:00
atm-ph
2636c2470b Fix width of payment term is to large 2017-11-10 10:52:58 +01:00
Laurent Destailleur
45fc5701ae NEW Add a profile to import product translations 2017-11-06 12:59:58 +01:00
Laurent Destailleur
8429de031f Code comment 2017-11-06 11:32:02 +01:00
Laurent Destailleur
32303d30fa Fix search on special char in module list 2017-10-31 10:46:23 +01:00
Laurent Destailleur
a40bebec40 Fix translation of module descriptions 2017-10-27 13:06:14 +02:00
Laurent Destailleur
6b65a9ac56 Fix position of resource menu 2017-10-24 09:58:32 +02:00
Laurent Destailleur
812687e10c FIX Restore feature to enable a module during CLI upgrade 2017-10-22 16:08:52 +02:00
Laurent Destailleur
728e36f70f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/api/index.php
	htdocs/comm/propal/class/api_proposals.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/class/api_invoices.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/actions_sendmails.inc.php
 2017-10-22 01:43:33 +02:00
Laurent Destailleur
cad44ee68a FIX substitution in ODT of thirdparties documents 2017-10-22 01:25:59 +02:00
Laurent Destailleur
1426737a26 Work on website 2017-10-21 12:26:14 +02:00
Laurent Destailleur
3bca0ad07d More modern picto for switch on/off 
Work on website module
 2017-10-20 21:39:19 +02:00
Laurent Destailleur
0e397b3e81 Work on website module 2017-10-20 18:44:03 +02:00
Laurent Destailleur
985675d680 Clean code 2017-10-20 18:04:46 +02:00
Laurent Destailleur
6165bcdbd0 NEW Can export list of stock movements 2017-10-20 14:52:01 +02:00
Laurent Destailleur
d82af57b57 NEW Add tab "Expense report" on user card 2017-10-19 20:56:23 +02:00
Laurent Destailleur
9c45e86a1c Introduce main_doc into table of objects to know what is main doc. 
Work on option PROPOSAL_USE_ONLINE_SIGN
 2017-10-19 11:40:40 +02:00
Laurent Destailleur
1e7f726168 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-11 12:21:52 +02:00
Laurent Destailleur
99afa3a3e0 Use a shorter key for column title 2017-10-11 12:19:44 +02:00