Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
69,558 Commits 36 Branches 189 Tags
04d33f45946a9f342024bd8b51f38bb362e0e11e
Commit Graph

254 Commits

Author SHA1 Message Date
Maxime Kohlhaas
46d3bec104 Fix replenish wasn't caring about supplier price min quantity #9561 2018-10-28 10:25:56 +01:00
Laurent Destailleur
9697bdf3b0 FIX #9393 inconsistency behaviour. option FACTURE_ENABLE_NEGATIVE_LINES 2018-09-04 10:38:09 +02:00
Laurent Destailleur
29ee5dffc4 Clean code 2018-06-04 12:55:55 +02:00
Laurent Destailleur
07b9a9b44d Better US english 2018-04-28 13:08:09 +02:00
Laurent Destailleur
d1e9a4719b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/accountancy/supplier/index.php
 2018-03-27 12:27:15 +02:00
Laurent Destailleur
89bf781fe6 FIX Add warning when expense report line not into range 
FIX Name of user not visible on journalizing expense report payments
FIX Only approved expense report must be journalized
 2018-03-26 14:13:40 +02:00
Laurent Destailleur
8d963adb43 Fix error message 2018-02-26 21:30:31 +01:00
Laurent Destailleur
a4b155fc91 Fix typo and 2018-02-16 20:42:40 +01:00
Laurent Destailleur
b5c12b346c Fix typo 2018-02-08 16:50:43 +01:00
Laurent Destailleur
19a0f552c9 Fix td balance 2018-02-08 16:50:01 +01:00
Ion
669e080670 More informative error message in dynamics price 2017-12-06 14:51:29 +01:00
Laurent Destailleur
64d29709d5 FIX #7881 error not reported/blocking when subprodut need lot 2017-12-01 18:12:29 +01:00
Laurent Destailleur
ae906270f3 Debug module variant 2017-11-26 18:43:43 +01:00
Ion Agorria
aa0b811f73 Undefined variable detection in price parser 2017-11-09 17:12:55 +01:00
Laurent Destailleur
bbe1c9c494 NEW Can download PDF document from the payment page 2017-10-30 00:45:47 +01:00
Regis Houssin
92ff974c5b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-25 06:47:34 +02:00
Laurent Destailleur
934edd9f5a Merge branch 'develop' into 6.0-api 2017-09-24 22:01:07 +02:00
Laurent Destailleur
fc5c9ad2f2 Merge pull request #7436 from fappels/6.0_Fix_expedition_error_handling 
Fix batch required for lot product error message.
 2017-09-20 17:33:05 +02:00
Regis Houssin
1f59e4f7e9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-20 12:47:35 +02:00
Laurent Destailleur
8dfa87fcf6 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-19 19:30:28 +02:00
Laurent Destailleur
f936b17d68 FIX Protection to avoid to apply credit note discount > remain to pay 2017-09-19 00:24:52 +02:00
Regis Houssin
bdc425c203 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-16 21:41:55 +02:00
Regis Houssin
87b81fb2fd NEW add members types ldap group management 2017-09-16 21:41:30 +02:00
Laurent Destailleur
318e285ba2 NEW Add protection to avoid to send to much emails using builk actions 2017-09-16 16:00:58 +02:00
fappels
681c2a67bd Fix batch required for lot product error message. 2017-09-11 23:22:44 +02:00
Laurent Destailleur
e7abb39ee2 NEW Template invoices are visible on the customer tab 2017-09-10 19:28:20 +02:00
Laurent Destailleur
4b9f54e571 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/data/llx_accounting.sql
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
	htdocs/install/mysql/tables/llx_holiday_config.sql
 2017-09-01 17:34:57 +02:00
Laurent Destailleur
6c202c5fa1 Fix vat rate to show and not vat amount 2017-08-29 19:55:49 +02:00
Laurent Destailleur
fa752348c8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/various_payment/index.php
	htdocs/contact/list.php
	htdocs/langs/en_US/errors.lang
 2017-08-02 17:56:09 +02:00
Laurent Destailleur
33d6903d3f Fix bad recipient when using mass actions 2017-08-02 11:39:11 +02:00
Laurent Destailleur
3ac85e10c5 NEW Add mass action "validate" on supplier invoices. 
NEW Add date_valid and date_pointoftax on supplier invoices.
 2017-07-14 14:40:09 +02:00
Laurent Destailleur
bebe7baa80 Fix images into medias not reabable into send emails 2017-06-17 10:44:08 +02:00
Laurent Destailleur
ac708a8ee9 Debug accounting module with new structure v6 
Make accounting module compatible with the new vat code to identify 2
vat code with same rate.
 2017-06-15 23:58:56 +02:00
Laurent Destailleur
5c58ed8ca7 Add a better error message when payment link is not valid. 2017-06-02 09:13:04 +02:00
Laurent Destailleur
c39ca4cff8 NEW Introduce function dol_compress_dir 2017-05-31 00:20:35 +02:00
Laurent Destailleur
c651f1da45 Work on modulebuilder tool 2017-05-27 19:05:36 +02:00
Laurent Destailleur
c26d24e97d Work on module builder 2017-05-09 00:00:09 +02:00
Laurent Destailleur
8ec44615cd FIX serious bugs in accounting (error management, transactions, bad 
values set)
 2017-04-29 14:54:21 +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
1a98c4a3ff Fix error management in adding translation key 2017-04-27 12:48:13 +02:00
Laurent Destailleur
4c056d68d8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/commande/list.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/bills.lang
	htdocs/societe/list.php
 2017-04-15 17:02:05 +02:00
Laurent Destailleur
106d19a8af FIX #6468 + Fix missing translation 2017-03-25 03:53:11 +01:00
Laurent Destailleur
4831fb4dcb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php
 2017-03-19 11:26:49 +01:00
Laurent Destailleur
597fb11d08 Fix error management in duplicate trigger 2017-03-18 11:36:48 +01:00
Laurent Destailleur
868f2e5473 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/update.php
	htdocs/core/lib/functions.lib.php
 2017-02-13 01:36:02 +01:00
Laurent Destailleur
ae740b7c1b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2017-02-13 01:19:30 +01:00
Laurent Destailleur
bf32acaadd Fix control of module format. 2017-02-13 01:13:41 +01:00
Laurent Destailleur
f34e0b1bdb NEW Can deploy an external module from the module setup area. 2017-02-11 15:41:01 +01:00
Laurent Destailleur
8ec1784e41 Better translation 2017-01-20 09:46:36 +01:00
Laurent Destailleur
6aa26e0f62 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/product/stock/massstockmove.php
	htdocs/projet/info.php
	htdocs/projet/tasks/time.php
	htdocs/societe/class/societe.class.php
 2017-01-13 16:49:18 +01:00