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

4160 Commits

Author SHA1 Message Date
Laurent Destailleur
6232e59fd2 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-26 14:17:36 +02:00
Laurent Destailleur
fac946dbb8 FIX The email test sender in email setup was broken 2016-09-26 14:08:14 +02:00
Laurent Destailleur
17f3e09689 Fix link https 2016-09-26 01:04:48 +02:00
gauthier
a0ec91cb94 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_add_limit_stock_product_by_warehouse 2016-09-20 12:03:55 +02:00
gauthier
7a0577ccfc NEW : add limit stock product by warehouse 2016-09-16 17:09:38 +02:00
BENKE Charlie
3d8f756646 prevent space separator in module definition 
If we type in definition of dictionnary "code,libelle, color" we can't insert/update value... 
propose to allow typing space bettween field (better lisibility) and remove space after
 2016-09-15 10:51:48 +02:00
Juanjo Menent
6e39d83480 Merge remote-tracking branch 'upstream/3.9' into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2016-09-09 16:51:41 +02:00
Juanjo Menent
d8f50f9acd Merge remote-tracking branch 'upstream/3.9' into 4.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2016-09-09 16:34:02 +02:00
Laurent Destailleur
0debcf745a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/cron/card.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
 2016-09-09 09:32:14 +02:00
Juanjo Menent
e3c2299c67 Merge remote-tracking branch 'upstream/3.8' into 3.9 
Conflicts:
	htdocs/admin/dict.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2016-09-08 18:52:44 +02:00
Laurent Destailleur
2b7ef01e42 FIX SEC for HTB23302 2016-09-08 11:09:38 +02:00
florian HENRY
d6be1cebcb work on going 2016-09-07 12:41:32 +02:00
Juanjo Menent
3078e6fa4b FIX: vat dictionary should allow enter and edit multiple values for localtaxes, separated by: (ex -19:-15) 2016-09-06 13:44:07 +02:00
Laurent Destailleur
898bbd6031 NEW Support extrafields for expense reports 2016-09-06 13:00:32 +02:00
Laurent Destailleur
8419202588 NEW Support free bottom text and watermark on expense report template 2016-09-06 12:47:18 +02:00
Laurent Destailleur
84ec5757a1 Uniformize look and feel 2016-09-04 15:06:34 +02:00
Laurent Destailleur
6da7410c18 Show warning for overwritten translation 2016-09-04 14:58:58 +02:00
Laurent Destailleur
d24045d831 NEW Editing translation GUI become easier with search translation tool. 2016-09-04 14:45:43 +02:00
Laurent Destailleur
cb27b01812 Work on feature to find a translation key 2016-09-03 18:47:04 +02:00
Laurent Destailleur
0e4b4ee321 Merge branch 'develop-external-logging' of 
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-develop-external-logging

Conflicts:
	composer.json
 2016-09-02 21:51:25 +02:00
Laurent Destailleur
524dd79198 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/bank/search.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/tasks/time.php
 2016-08-31 00:16:07 +02:00
Laurent Destailleur
cd1a12c686 NEW Can edit a label for each price segment when using several segment 
prices for products.
 2016-08-29 16:30:31 +02:00
Laurent Destailleur
330e494eda NEW Can filter on fields on admin translation page 2016-08-28 22:46:09 +02:00
Laurent Destailleur
4215ec3ca9 FIX usage of sepa generation setup. 2016-08-28 20:12:25 +02:00
Laurent Destailleur
fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/sociales/charges.php
	htdocs/core/boxes/modules_boxes.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
 2016-08-28 02:40:20 +02:00
Laurent Destailleur
0d992b2b99 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/cron/class/cronjob.class.php
	htdocs/install/pgsql/functions/functions.sql
 2016-08-28 02:17:04 +02:00
philippe grand
919b73b4c4 fix : translation 2016-08-19 16:29:54 +02:00
Raphaël Doursenaud
49cb61b530
CLOSE #5627 Allowed external logging modules. 
Removed Sentry logging.
 2016-08-16 03:24:04 +02:00
Laurent Destailleur
6c5849fc87 Fix field too small 2016-08-09 15:56:39 +02:00
Laurent Destailleur
034b08ce56 NEW Add option "Hide images in Top menu". 2016-08-05 23:40:00 +02:00
florian HENRY
0780188f4e taking account @eldy remarks 2016-08-05 09:46:17 +02:00
florian HENRY
a39290022f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_NEW_ClassOrderDeliverStatusOnStockVentil

Conflicts:
	htdocs/langs/en_US/workflow.lang
 2016-08-05 09:34:27 +02:00
Laurent Destailleur
544d5af49b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-05 01:15:35 +02:00
Laurent Destailleur
33d12a4492 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/admin.lang
 2016-08-05 01:15:19 +02:00
Laurent Destailleur
c73f962b28 Merge pull request #5585 from atm-florian/dev_NEW_workflow_ClassPropalBillOnBillValidation 
NEW : Add workflow to classifed propal bill on invoice validation
 2016-08-05 00:46:12 +02:00
Laurent Destailleur
5126786d60 NEW Add option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED 2016-08-04 15:48:34 +02:00
florian HENRY
4001bc474e NEW : Add workflow to calculated supplier order status on stock dispatch 2016-08-04 11:37:32 +02:00
Laurent Destailleur
af150c35fc Fix no picto on setup pages 2016-08-04 10:19:30 +02:00
florian HENRY
f0622139ff NEW : Add workflow to classifed propal bill on invoice validation 2016-08-04 09:55:16 +02:00
Laurent Destailleur
88dcb27981 Fix option not visible when it should 2016-08-02 21:24:14 +02:00
Laurent Destailleur
b267402df6 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php
 2016-08-01 15:15:32 +02:00
Laurent Destailleur
1e037a9b95 Fix pb of responsive design 2016-07-31 18:28:59 +02:00
Laurent Destailleur
5b4c215526 Fix size of field too small and bad translation 2016-07-30 10:31:56 +02:00
Laurent Destailleur
a7b21db210 Fix code is not mandatory on vat table 2016-07-29 17:22:02 +02:00
Laurent Destailleur
f54946bacb Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
 2016-07-28 10:10:58 +02:00
Laurent Destailleur
0334b58a4b Hide feature not yet validated to be ready for a stable 4.0 2016-07-27 20:24:30 +02:00
Laurent Destailleur
8b3136cb96 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/companies.lang
 2016-07-27 19:04:55 +02:00
Laurent Destailleur
3b1d6818b8 Update ldap translation 2016-07-27 17:26:04 +02:00
Laurent Destailleur
eddac89bad FIX Fatal error if curl not installed 2016-07-27 16:45:13 +02:00
Laurent Destailleur
a1c959e9d6 Merge pull request #5536 from defrance/patch-17 
NEW add edition feature on action/agenda element
 2016-07-26 15:29:45 +02:00
Juanjo Menent
0459c6f682 Merge pull request #5545 from GPCsolutions/develop-orderinterfix 
Fix: Fixed interventions from order.
 2016-07-26 12:01:09 +02:00
Laurent Destailleur
3265b7028d Merge remote-tracking branch 'origin/4.0' into develop 2016-07-25 19:53:28 +02:00
Raphaël Doursenaud
052a11a5c0
Fixed interventions from order. 
Handling of predefined services was buggy and resulted in an SQL error
because of uninitialized duration.

Generalized services duration handling and exposed it in the module's
admin page.
 2016-07-25 17:24:57 +02:00
BENKE Charlie
6acff5dcb5 Update agenda_other.php 2016-07-25 11:31:10 +02:00
BENKE Charlie
cba9bae124 Update agenda_other.php 2016-07-25 11:30:05 +02:00
Laurent Destailleur
59e9d7f397 Fix the repositioning works better with new system class="reposition" 
compared to old system (#tag)
 2016-07-23 13:41:06 +02:00
Laurent Destailleur
343561be7a Fix colspan 2016-07-23 13:37:17 +02:00
Laurent Destailleur
867a0072e3 Fix forcing on module setup was not working 2016-07-23 13:20:34 +02:00
Laurent Destailleur
a290757d2d Merge pull request #5355 from atm-gauthier/NEW_allow_paiement_on_several_companies_bills_with_same_parentcompany 
NEW Option to allow payment on bills of different companies (with same parent company)
 2016-07-20 19:34:51 +02:00
Laurent Destailleur
e2a03d18dd Merge remote-tracking branch 'origin/4.0' into develop 2016-07-16 19:58:36 +02:00
Laurent Destailleur
4b854fb33d Fix better error message when possible refering objects list is empty. 2016-07-16 14:37:35 +02:00
Laurent Destailleur
28d86bc5a0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-15 19:57:46 +02:00
Laurent Destailleur
97b03e225b NEW Add option "Stock can be negative". Off by default. 2016-07-15 19:57:35 +02:00
Juanjo Menent
d932bb9532 Merge pull request #5488 from simnandez/develop 
NEW Do not use Functions Aliases
 2016-07-15 18:44:22 +02:00
Laurent Destailleur
7263b29cb4 Merge pull request #5301 from atm-ph/fix_develop_issue_2858 
NEW issue 2858 - Option to allow negative transfer
 2016-07-15 18:15:20 +02:00
Juanjo Menent
62c1302a27 NEW Do not use Functions Aliases 2016-07-15 17:58:14 +02:00
Laurent Destailleur
9ba1ca5acb Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14 
Conflicts:
	htdocs/langs/en_US/companies.lang
 2016-07-15 17:05:12 +02:00
appchecker
4b1dfbc2fb replace intval with GETPOST 2016-07-11 12:56:05 +03:00
appchecker
9895084627 prevent SQLi 2016-07-07 20:23:38 +03:00
Laurent Destailleur
23cac5b157 FIX link to check prof id was hardcoded instead of using dedicated 
function
 2016-07-04 10:28:11 +02:00
Laurent Destailleur
91d2d573c3 Fix NNE has been replaced with ICS 2016-07-02 11:26:55 +02:00
phf
8c133d8546 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_develop_issue_2858 
Conflicts:
	htdocs/core/class/ldap.class.php
 2016-06-30 17:09:22 +02:00
Laurent Destailleur
5f5328c3d8 FIX Link in menu when using left menu editor was wrong. 
FIX Updating an entry with menu editor did not save fk_leftmenu.
 2016-06-29 14:09:18 +02:00
Laurent Destailleur
ab444af8c2 Fix bad css 2016-06-29 13:38:19 +02:00
Laurent Destailleur
266fef40ad Add a way to enhance security check. 2016-06-25 15:16:32 +02:00
Laurent Destailleur
5222b78e95 FIX property of bank account were lost if an error occured during 
saving.
 2016-06-25 14:20:23 +02:00
Frédéric FRANCE
e7b49a4fca Update supplier_order.php 2016-06-23 18:20:03 +02:00
philippe grand
cc4fe87e13 internationalization of code comment 2016-06-21 17:00:52 +02:00
philippe grand
0cc990402e internationalization of code comment 2016-06-19 17:39:40 +02:00
Laurent Destailleur
8187dc2006 Fix css 2016-06-19 16:07:34 +02:00
Laurent Destailleur
de76f2a9aa Clean language files 2016-06-18 15:50:37 +02:00
gauthier
427695d869 FIX : New conf must be in payments tab 2016-06-17 17:26:49 +02:00
Laurent Destailleur
e4923fa18a Merge pull request #5346 from damirugrin/develop 
Conflict with ModSecurity solved in facture.php.
 2016-06-16 20:21:24 +02:00
Laurent Destailleur
3720c95a52 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-06-16 09:50:45 +02:00
Laurent Destailleur
2395099d0f Debug Oauth 2016-06-15 17:20:00 +02:00
gauthier
a0051a856a NEW : conf to allow payments on different thirdparties bills but same parent company 2016-06-15 17:10:42 +02:00
Laurent Destailleur
5b5b7a2bf9 FIX Bad value used for task warning delay 
FIX Compatibility datee and date_end for warning of tasks
 2016-06-15 14:05:48 +02:00
damirugrin
ec6dd0c42f Update facture.php 2016-06-13 18:48:10 +02:00
damirugrin
c5dcebb58e Conflict with ModSecurity solved. 
When ModSecurity is enabled on apache server then "scandir" is forbidden word. When changing numbering model then you will find following error in apache log: 
ModSecurity: Access denied with code 403 (phase 2). Pattern match "(?i)(?:\\\\b(?:f(?:tp_(?:nb_)?f?(?:ge|pu)t|get(?:s?s|c)|s(?:ession_start|candir)
I have changed "scandir" to "scan_dir".
 2016-06-13 18:13:41 +02:00
Laurent Destailleur
9019576394 Fix css class opacitymedium was not used everywhere. 2016-06-07 15:58:02 +02:00
phf
c62a69ccc8 Merge branch 'fix_3.7_issue_2858' into develop 2016-06-04 18:54:55 +02:00
phf
3cbbdf5e20 Fix #2858 2016-06-04 18:23:22 +02:00
Maxime Kohlhaas
d777fca0b9 Warning messages after module activation and for user with no permission 2016-06-04 13:25:39 +02:00
Juanjo Menent
baa6dd84cf Fix better perfomance in for 2016-06-04 13:12:05 +02:00
Laurent Destailleur
bfb7923d4c Merge pull request #5268 from atm-ph/fix_multicurrency_conf 
Fix conf useful has been commented
 2016-06-04 11:37:01 +02:00
phf
b000ccf2e2 Fix traduction for multicurrency module 2016-06-04 01:46:10 +02:00
Laurent Destailleur
b57476153f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/consumption.php
 2016-06-04 01:14:36 +02:00
phf
e3a5af6ad4 Fix clean multicurrency admin 2016-06-04 00:42:01 +02:00
phf
923952fb25 Fix conf useful has been commented 2016-06-03 23:36:58 +02:00
Frédéric FRANCE
19f6aa805b select engine for code 128 didn't work 2016-06-02 11:41:26 +02:00