2
0
forked from Wavyzz/dolibarr
Commit Graph

2615 Commits

Author SHA1 Message Date
Laurent Destailleur
7662ddc2fc Merge pull request #6529 from dolibarr95/patch-4
NEW : Create a trigger for company create RIB
2017-03-18 03:18:31 +01:00
Laurent Destailleur
dfc1ed7d72 FIX #6535 2017-03-16 22:49:02 +01:00
Laurent Destailleur
deb91ad7c1 FIX Data lost during merge of thirdparties 2017-03-15 13:30:30 +01:00
Laurent Destailleur
888675016d NEW Can use dol_fiche_end without showing bottom border. 2017-03-15 11:13:30 +01:00
dolibarr95
0721e6af42 add condition
add condition check for $notrigger
2017-03-15 10:37:08 +01:00
dolibarr95
688073dc18 Create a trigger for company create RIB
Since there no 'trigger' executed when we create a RIB for a company (COMPANY_CREATE, COMPANY_MODIFY, COMPANY_DELETE not executed), I purpose a new one COMPANY_RIB_CREATE. If this PR is qualified i will purpose COMPANY_RIB_MODIFY and COMPANY_RIB_DELETE too.

tks
2017-03-15 10:31:45 +01:00
Josep Lluís
14ed67499e FIX html tag
Fix incorrect html tag not closed
2017-03-14 00:26:47 +01:00
Laurent Destailleur
3affcd7f52 FIX colspan 2017-03-13 02:12:24 +01:00
Laurent Destailleur
b8b32ae2e3 FIX colspan 2017-03-13 02:10:22 +01:00
Laurent Destailleur
4ca634b41c Better look and feel 2017-03-11 12:04:28 +01:00
Laurent Destailleur
5f79b2d0c6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/accountancy/admin/categories.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2017-03-05 22:11:35 +01:00
Laurent Destailleur
f67c967d0b FIX The vat rate line used when adding a predefined product was wrong if
there is several vat line with same rate.
2017-03-04 22:27:44 +01:00
Laurent Destailleur
8ad9a9c9c8 doxygen 2017-03-03 15:15:21 +01:00
Laurent Destailleur
5c2ed0f19f Fix field title lost 2017-02-28 12:57:34 +01:00
Laurent Destailleur
bc41b6dfe2 Merge pull request #6459 from defrance/patch-84
Add selectform for frst recur option (better usage)
2017-02-24 15:28:16 +01:00
Laurent Destailleur
92d9eb3c5d Several fix for a better management of #6424 2017-02-22 17:46:54 +01:00
BENKE Charlie
55070ab907 Add selectform for frst recur option (better usage) 2017-02-22 16:51:30 +01:00
Laurent Destailleur
24c2675705 Merge pull request #6424 from atm-florian/dev_can_send_to_multiple_email
NEW : Can send email to multiple destinaries from mail form
2017-02-22 14:39:35 +01:00
Laurent Destailleur
19e60f03b9 Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms 2017-02-21 14:17:44 +01:00
florian HENRY
4836fa8f76 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_can_send_to_multiple_email 2017-02-17 13:24:06 +01:00
BENKE Charlie
90770a1f23 Accounting code not display on tooltip 2017-02-17 10:47:29 +01:00
florian HENRY
5ec01b3175 NEW : Can send email to multiple destinaries from mailform 2017-02-15 11:41:09 +01:00
Gustavo Novaro
febe95cd2e $db attributte now be protected 2017-02-08 20:27:14 -03:00
Gustavo Novaro
e053308c6f Code style
var to public
2017-02-08 17:24:11 -03:00
Laurent Destailleur
b611c5ca53 Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received
NEW Develop new reduc on excess received
2017-02-08 11:16:10 +01:00
Laurent Destailleur
31c3398b7f Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/modules.php
2017-02-08 10:59:05 +01:00
Laurent Destailleur
dc0856413c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-08 10:57:02 +01:00
Laurent Destailleur
d7060b0c4b FIX #6360 2017-02-02 03:14:21 +01:00
Laurent Destailleur
c3fb559d3b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modProduct.class.php
2017-02-01 20:58:17 +01:00
Laurent Destailleur
fbbf8cd8a4 Fix bad side effect of uniformizing a constant name. 2017-02-01 15:47:08 +01:00
Laurent Destailleur
9a9b31c9c0 Fix cancel button + logic to close project when setting opp to WON/LOST. 2017-02-01 13:25:16 +01:00
Laurent Destailleur
fd90bf466b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/societe/soc.php
2017-01-28 15:12:14 +01:00
Laurent Destailleur
1e78c4c418 FIX Change the customer code only if error on duplicate 2017-01-28 14:54:06 +01:00
Laurent Destailleur
27caa586c2 Fix auto increment customer code must be done only if error is on
duplicate code
2017-01-28 12:36:53 +01:00
Laurent Destailleur
70091eceed Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expensereport/card.php
2017-01-27 01:26:11 +01:00
Laurent Destailleur
0c14e1d233 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-27 01:24:55 +01:00
Laurent Destailleur
1239e8600a Merge pull request #6326 from altatof/fix_entity_thirdpart_files
Fix entity thirdparty files links
2017-01-27 00:30:03 +01:00
altatof
09dde659d5 FIX: add entity param to document link 2017-01-25 09:26:26 +01:00
Laurent Destailleur
1878647d26 NEW Add statistics on supplier tab. 2017-01-23 20:54:52 +01:00
Regis Houssin
e2e4403869 Fix: avoid numeric errors 2017-01-23 12:20:44 +01:00
Laurent Destailleur
39151d7a74 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64 Fix css and look 5.0 2017-01-22 12:13:32 +01:00
Laurent Destailleur
5362d10c0d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/hookmanager.class.php
2017-01-21 21:56:24 +01:00
Laurent Destailleur
3a2d9c8610 Fix for rtl languages 2017-01-21 16:12:25 +01:00
Laurent Destailleur
94249b7926 NEW Add statistics on tabs 2017-01-20 14:03:07 +01:00
Laurent Destailleur
412be59f78 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2017-01-20 12:09:39 +01:00
Ferran Marcet
caba4836b3 Fix: Show correct bank account order 2017-01-17 10:13:13 +01:00
Ferran Marcet
819dc44533 Fix: Show correct bank account order 2017-01-17 10:01:59 +01:00
Laurent Destailleur
c1d6ad90b3 FIX #6255 2017-01-16 12:35:19 +01:00
Laurent Destailleur
a05132d26e Fix PHP 7.1 error 2017-01-16 09:05:09 +01:00