lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
61,983 Commits 43 Branches 150 Tags 886 MiB
6.0
Commit Graph

2759 Commits

Author SHA1 Message Date
Laurent Destailleur
8a71b9e95e Avoid creation of dir that is not indexed 2017-08-04 13:51:25 +02:00
Laurent Destailleur
a8e2f95c39 Better help 2017-08-03 10:47:35 +02:00
Laurent Destailleur
71d49f1c6f Fix pb in ecm 2017-08-01 18:44:34 +02:00
Laurent Destailleur
03b3f54c2c Fix class not found 2017-08-01 13:10:15 +02:00
Laurent Destailleur
d8121c133e Merge pull request #7205 from atm-quentin/6.0 
FIX invoice situation division by zero
 2017-07-31 02:23:37 +02:00
Laurent Destailleur
ef3c002144 Module website not stable enough 2017-07-28 12:37:52 +02:00
atm-quentin
8451ba1f14 FIX invoice situation division by zero 2017-07-26 14:43:10 +02:00
Laurent Destailleur
c386a02889 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/langs/en_US/stocks.lang
 2017-07-25 21:10:08 +02:00
Laurent Destailleur
8b793a261f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
 2017-07-25 21:08:31 +02:00
Laurent Destailleur
6a3add6e57 Merge pull request #7196 from hregis/6.0_bug 
Fix: translation error
 2017-07-25 13:33:18 +02:00
florian HENRY
d6d454edc8 fix : Various misspelling class (eclipse Oxygen standard PHP control) 2017-07-25 13:32:27 +02:00
Regis Houssin
88968aae22 Fix: translation error 2017-07-24 09:10:59 +02:00
Regis Houssin
2e63393bf2 Fix: wrong values if array used to force entity 0 2017-07-21 19:35:08 +02:00
Laurent Destailleur
4fa04247a9 Finished dev 2017-07-17 11:09:32 +02:00
Laurent Destailleur
e5513cff91 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
 2017-07-15 21:24:21 +02:00
Laurent Destailleur
4e45c7fdba Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2017-07-15 21:21:40 +02:00
Laurent Destailleur
1735a649e9 Fix permission on salary module 2017-07-15 13:02:41 +02:00
Laurent Destailleur
0763d15b4c Debug journalization 
Debug edition of user BAN.
 2017-07-15 12:37:31 +02:00
Laurent Destailleur
de66971d93 Fix bad setup 2017-07-14 15:49:33 +02:00
Regis Houssin
f745c87394 Fix: error during upgrade process 2017-07-11 21:27:51 +02:00
Laurent Destailleur
d223283359 Fix phpcs 2017-07-08 20:59:53 +02:00
Laurent Destailleur
f40afcf023 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/compta/facture/list.php
	htdocs/compta/paiement/class/cpaiement.class.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/expensereport/card.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/product/stats/facture.php
 2017-07-08 18:32:34 +02:00
Laurent Destailleur
cf6745b1ae Debug module builder 2017-07-08 17:08:07 +02:00
Laurent Destailleur
bcbd2a8a91 Merge pull request #7108 from atm-ph/fix_develop_import_update 
Fix update row on xlsx import do not work as csv import
 2017-07-07 20:00:28 +02:00
Laurent Destailleur
c6fc7313b1 Merge pull request #7116 from atm-ph/fix_7109 
FIX 7109 - class name already exist for customer payment
 2017-07-07 19:01:10 +02:00
Laurent Destailleur
252d8da8fc Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2017-07-07 15:11:53 +02:00
alexis Algoud
3d18c71201 FIX invoice situation VAT total rounding into PDF crabe 2017-07-05 17:21:37 +02:00
phf
31b94c1d3f Fix 7109 - class name already exist for customer payment 2017-07-05 16:52:37 +02:00
phf
3892da7606 Fix update row on xlsx import do not work as csv import 2017-07-04 12:09:56 +02:00
Laurent Destailleur
9e26e6b0a3 Fix bad value for ref of old contracts 2017-07-03 11:42:17 +02:00
Laurent Destailleur
53708c138a Add option to be able to debug problem of apache lock page 2017-07-01 16:52:28 +02:00
Laurent Destailleur
ea504a0516 FIX We should be able to insert data with value '0' into const 2017-06-30 11:10:05 +02:00
BENKE Charlene
b17937ce0d Error fields and add date end on rapport pdf 
percentage instead percent
 2017-06-28 21:29:01 +02:00
Maxime Kohlhaas
cef5c0b375 Fix column position in PDF when VAT is hidden 2017-06-28 00:38:24 +02:00
Maxime Kohlhaas
3664956b8c Update pdf_azur.modules.php 2017-06-28 00:31:33 +02:00
Laurent Destailleur
7e6e0ee3a4 Fix link to image of MD files 2017-06-27 20:02:46 +02:00
Laurent Destailleur
08af9bf365 List before 2017-06-27 10:37:00 +02:00
Laurent Destailleur
3fdfebf7ef Fix position of top menu does not follow 'position' field. 2017-06-27 04:25:41 +02:00
BENKE Charlene
03cb850442 $forceimgscaleheight instead $forceimgscalewidth 2017-06-24 20:48:11 +02:00
Laurent Destailleur
b0c5616ff0 Fix in the way markdown README and ChangeLog are output on module page. 2017-06-24 16:01:18 +02:00
Laurent Destailleur
81a473d547 Warning not required for the moment 2017-06-23 23:40:02 +02:00
Laurent Destailleur
efe5d79a86 Work on #6958. Only one type of invoice supported for supplier invoices 2017-06-20 12:58:43 +02:00
Laurent Destailleur
24f7128742 Fix pb with postgresql 2017-06-19 21:04:46 +02:00
Inovea Conseil
85efe6ef74 Add import fields for societe rib 
Add import fields for rib account, this fields are used in a new external module bankwire for supplier invoice.

But we must copy the translation of banks.lang in bills.lang are there an other solution  ?
 2017-06-19 11:32:11 +02:00
Laurent Destailleur
7c41c9a3e4 Fix activation of dependency for a dedicated country. 
BlockedLog depends now on CashDesk only.
 2017-06-17 11:43:00 +02:00
Laurent Destailleur
1c8daf9700 Standardize and debug code of module BlockedLog 2017-06-16 12:46:15 +02:00
Laurent Destailleur
097be322a6 Modify code to match new v6 structure. 2017-06-15 19:29:00 +02:00
Laurent Destailleur
c088ccea32 Fix better management of export of extrafield computed. 2017-06-13 18:50:31 +02:00
Laurent Destailleur
ba3a74576c Merge 5.0 2017-06-12 18:22:51 +02:00
Laurent Destailleur
5471170a97 Merge pull request #6969 from atm-alexis/NEW_blocklog_develop_refactor 
NEW blockedlog hash and authority
 2017-06-11 15:54:47 +02:00
Laurent Destailleur
36b18f0300 Save MAIN_VERSION_FIRST_INSTALL that is not erased. 2017-06-10 22:11:12 +02:00
atm-ph
0d24df9ffc Fix 6939 new path for pictures is not used 2017-06-10 14:40:17 +02:00
Alexis Algoud
3d5899edf3 final blockedlog init 2017-06-10 09:25:32 +02:00
Regis Houssin
2df33d1df3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc
 2017-06-03 11:45:15 +02:00
Laurent Destailleur
66420d0e80 Restore lost file and better generation of modules 2017-06-02 23:02:48 +02:00
Laurent Destailleur
7ad92c3a4d Fix new generic substitution system 2017-06-01 13:32:20 +02:00
Laurent Destailleur
77df19009d Removed duplicated code 2017-06-01 12:11:45 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
5cb38ece19 Fix travis errors 2017-05-21 19:37:15 +02:00
Laurent Destailleur
80cbc28385 NEW Add REST API to push a file. 2017-05-20 15:52:36 +02:00
Laurent Destailleur
4e7353f8a0 Clean code 2017-05-19 13:39:00 +02:00
Laurent Destailleur
88fc7dbc3e Fix remove warning 2017-05-18 19:24:44 +02:00
Laurent Destailleur
4a46480ef5 Fix preview of PDF contract 2017-05-18 12:40:20 +02:00
Laurent Destailleur
998254d9c6 Finish rewrite and debug of module Stripe. 2017-05-14 16:17:23 +02:00
Laurent Destailleur
57ba598b15 Merge pull request #6771 from aspangaro/6.0-stripe 
New : Module Stripe
 2017-05-13 19:55:29 +02:00
Laurent Destailleur
6f9e67b1fb Remove no more used constant 2017-05-13 13:08:25 +02:00
Laurent Destailleur
fa290c34fa Fix against SQL injection. Add phpunit to detect missing escapement. 2017-05-12 16:55:11 +02:00
Laurent Destailleur
cd72c50356 Merge pull request #6799 from Dolibarr/scrutinizer-patch-2 
Scrutinizer Auto-Fixes
 2017-05-11 00:04:12 +02:00
Laurent Destailleur
30cf3f2bda Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/install/mysql/tables/llx_bank_account.sql
 2017-05-11 00:03:06 +02:00
Laurent Destailleur
823e5b48e3 Code comment 2017-05-10 18:56:18 +02:00
BENKE Charlie
d570df5089 inverted value between FRST & RECUR 2017-05-10 18:17:28 +02:00
Thomas Raschbacher
70de54e97d fix project extrafields for ODT 
for some raeson the code was checking for already existing extra fields before even fetching it. removed the if condition, now it works fine.
 2017-05-10 15:21:53 +02:00
Thomas Raschbacher
267e66abfa Add more fields to projectcontacts substitution 
civility added + extrafields for external contacts + isInternal to decide in template wether to list internal or not
 2017-05-10 08:48:28 +02:00
Laurent Destailleur
cf04e5a6e0 Fix duplicate id 2017-05-09 10:45:49 +02:00
Alexandre SPANGARO
16a41242d3 Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-05-08 06:39:14 +02:00
Laurent Destailleur
46ff62fc87 Work on inventory module debug 2017-05-06 22:28:07 +02:00
Laurent Destailleur
910a925167 NEW Add last activation author and ip of modules 2017-05-06 20:43:14 +02:00
Scrutinizer Auto-Fixer
d93552c8c5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-05-05 17:13:29 +00:00
Laurent Destailleur
d60e98a797 No payment information on a supplier proposal by default. 2017-05-05 13:50:14 +02:00
Laurent Destailleur
68b63927e0 Maxi miscellaneous debug 2017-05-05 12:33:49 +02:00
Laurent Destailleur
768df56c07 Uniformize name of standard PDF template 2017-05-04 20:16:55 +02:00
Laurent Destailleur
c196e79bf4 Merge branch 'develop' into FIX_inventory 2017-05-04 13:50:53 +02:00
Laurent Destailleur
3871da0324 Merge pull request #6729 from atm-florian/dev_importexport_ressources 
NEW : Add module resources import/export
 2017-05-04 09:43:00 +02:00
alexis Algoud
12e91f1c1b fix rights inventory only for MAIN_LEVEL_FEATURES = 2 2017-05-02 15:25:30 +02:00
alexis Algoud
6138d197e4 FIX major issues for inventory 
- Move all needed declaration from coreobject to commonobject for
updateCommon, fetchCommon, deleteCommon, createCommon
- Just leave method for child object into coreobject, check later if is
useless
- debug inventory card, PHP 7.0 compatibility
- activate rights for inventory into stock module
- add inventory options into stock admin module
 2017-05-02 15:19:55 +02:00
Marcos García de La Fuente
7ae405a254 Corrected PHP7 warnings for several PDF document models 2017-05-02 14:08:20 +02:00
Marcos García de La Fuente
6e7fddee7d Corrected PHP7 warnings for function pdf_einstein::write_file 2017-05-02 14:07:04 +02:00
Laurent Destailleur
92b5f8d85e Move new feature inventory into module stock. 2017-04-29 21:53:01 +02:00
Laurent Destailleur
f5bdfc426f Merge pull request #6584 from atm-ph/NEW_inventory_coreobject_listview 
New inventory coreobject listview
 2017-04-29 21:31:46 +02:00
Laurent Destailleur
a8c775dcbd Fix compatibility with the removal of "constant". 2017-04-29 18:48:30 +02:00
Alexandre SPANGARO
586ea54bfc Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-04-29 07:05:02 +02:00
phf
8219ff84c8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview 2017-04-28 14:45:04 +02:00
Laurent Destailleur
cfde27820e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/translation.php
	htdocs/comm/card.php
	htdocs/core/menus/standard/eldy.lib.php
 2017-04-27 17:20:40 +02:00
Laurent Destailleur
10e2b128d1 Fix warning during install 2017-04-24 05:20:45 +02:00
Laurent Destailleur
65fec95458 Fix debian package 2017-04-24 04:17:59 +02:00
Alexandre SPANGARO
3b626b75c4 Update works 2017-04-22 06:58:44 +02:00
Alexandre SPANGARO
c3fe1c963a Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-04-22 06:33:31 +02:00
Laurent Destailleur
cfc31e91e8 FIX overwrapping of weight/volume on rouget template 2017-04-18 18:13:43 +02:00
florian HENRY
a52db08cd6 NEW : Add module resources import/export 2017-04-18 15:25:04 +02:00
Alexandre SPANGARO
d0e27f67e7 Add plugins Stripe 2017-04-18 05:44:08 +02:00