Commit Graph

53263 Commits

Author SHA1 Message Date
nka11
4eb1aa59aa fix coding rules 2016-04-18 19:11:28 +02:00
Frédéric FRANCE
18b3b3a31d Update rappro.php 2016-04-18 08:14:02 +02:00
Frédéric FRANCE
c6226e63b7 Update 3.9.0-4.0.0.sql 2016-04-18 08:13:01 +02:00
aspangaro
19b594ee9d Correct travis 2016-04-17 15:58:32 +02:00
aspangaro
b59c94e056 NEW: Accountancy - Add Result page
& review
2016-04-17 15:44:04 +02:00
Marcos García de La Fuente
e2c86d3fd8 NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead 2016-04-17 15:24:22 +02:00
Marcos García de La Fuente
54dd1763fe Little refactor 2016-04-17 15:05:54 +02:00
Frédéric FRANCE
d5980a5bf8 Update html.formmail.class.php 2016-04-17 12:20:45 +02:00
Marcos García de La Fuente
21ba24a0cd NEW Deprecated Societe::set_prospect_level, Societe::set_commnucation_level, Societe::set_OutstandingBill functions 2016-04-16 22:13:55 +02:00
Marcos García de La Fuente
84b58d27e6 NEW Renamed ActionComm::add function to ActionComm::create 2016-04-16 21:41:06 +02:00
Marcos García de La Fuente
863efcbc5d NEW Removed unused FormOrder::selectSourcesCommande function
Also refactored select functions to avoid using HTML and encourage using Form::selectarray function
2016-04-16 21:33:23 +02:00
Marcos García de La Fuente
3722fc1014 Refactored FormVentilation class 2016-04-16 20:16:38 +02:00
appchecker
bc949cafd2 fix: comparing instead of assign 2016-04-16 13:39:55 +03:00
Juanjo Menent
7163ee55f7 Merge pull request #5017 from simnandez/develop
FIX Travis fails
2016-04-16 09:34:46 +02:00
Juanjo Menent
a2b680aa5a Merge remote-tracking branch 'upstream/develop' into develop 2016-04-15 18:08:12 +02:00
Juanjo Menent
b7d36da74f Merge pull request #5006 from atm-maxime/new_banklink_withdraw
New add link to widthdraw slip card on bank transaction
2016-04-15 18:07:33 +02:00
Juanjo Menent
f86952dfaa FIX Add missing field fk_shipping_method_id 2016-04-15 16:57:11 +02:00
Juanjo Menent
b5f7f962cc FIX Travis fails 2016-04-15 16:05:47 +02:00
Juanjo Menent
bff1ec2d80 Merge remote-tracking branch 'upstream/3.9' into develop 2016-04-15 13:49:59 +02:00
Juanjo Menent
8751f6cfa0 Merge pull request #4998 from FHenry/3.9
FIX Hook resprint  must be printed
2016-04-15 13:05:40 +02:00
Christophe Battarel
1676595b93 NEW: fichinter lines ordered by rang AND DATE 2016-04-14 10:50:32 +02:00
Maxime Kohlhaas
9de6d31c87 New add link to widthdraw slip card on bank transaction 2016-04-13 15:57:46 +02:00
Laurent Destailleur
e1d35c2797 Fix waarnings 2016-04-12 19:29:32 +02:00
Laurent Destailleur
87702f89fc Work on website module 2016-04-12 19:17:50 +02:00
Laurent Destailleur
df8bbaee34 Add icone for website module 2016-04-12 18:24:35 +02:00
fappels
2462716eb4 Fix migration script 2016-04-12 16:24:00 +02:00
Laurent Destailleur
8d46d76f96 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/fourn/facture/paiement.php
2016-04-12 15:05:18 +02:00
Laurent Destailleur
e61c83d708 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/fourn/facture/paiement.php
2016-04-12 15:03:19 +02:00
Laurent Destailleur
8342a61ea9 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/fourn/facture/card.php
	htdocs/product/composition/card.php
2016-04-12 15:00:02 +02:00
Laurent Destailleur
fedcad31e0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/admin/multicurrency.php
2016-04-12 14:47:16 +02:00
Laurent Destailleur
357877b1fe Debug multicurrency and clean properties of some modules 2016-04-12 14:45:59 +02:00
Laurent Destailleur
7ce82aaf16 Removed hidden option MAIN_MENU_USE_JQUERY_LAYOUT. This feature will be
implemented with pure CSS/Jquery so no more need of not maintained
external library.
2016-04-12 13:38:41 +02:00
Laurent Destailleur
56c64f22be Prepare menu icon to hide/show left menu 2016-04-12 13:30:47 +02:00
Florian HENRY
872c99afe9 FIX Hook resprint be printed 2016-04-12 11:35:39 +02:00
Christophe Battarel
0dd25a7e70 add new filter in GROUP BY clause 2016-04-12 09:39:48 +02:00
nka11
9ced1dc008 fixing some style and renaming Account to User API 2016-04-11 23:27:43 +02:00
fappels
64f4a6577d Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2016-04-11 23:03:53 +02:00
nka11
e5a447c148 Adding more line features (PUT, DELETE, POST) 2016-04-11 22:41:35 +02:00
Laurent Destailleur
b71c6a8a54 Merge pull request #4800 from atm-ph/new_multicurrency_sync_rates
New multicurrency sync rates
2016-04-11 19:20:59 +02:00
Laurent Destailleur
d0e3d9db76 Merge pull request #4992 from altatof/fix_minimum_buying_price
FIX: correct display of minimum buying price
2016-04-11 19:17:09 +02:00
Laurent Destailleur
fabeb37b65 Merge pull request #4990 from FHenry/3.9
FIX  #4989
2016-04-11 19:09:46 +02:00
Laurent Destailleur
3127432a4d Merge pull request #4987 from marcosgdf/bug-4874
FIX #4874 SQL error when listing users
2016-04-11 19:08:56 +02:00
Laurent Destailleur
4d14f3e6f2 Merge pull request #4983 from marcosgdf/bug-4442
FIX #4442 Missing translation in Banks menu
2016-04-11 18:59:03 +02:00
Laurent Destailleur
46dd3c0cec Merge pull request #4982 from marcosgdf/bug-4737
FIX #4737 Bank transacion type selector translation is cropped
2016-04-11 18:58:26 +02:00
Laurent Destailleur
b60e90a7b7 NEW A module can add, into its import profiles, a sql request to execute
at end of import. This allow to update dernormalized data after import.
2016-04-11 18:08:03 +02:00
nka11
1fdcd0e859 Fixed bugs in order api. Added method for posting new lines in order 2016-04-11 18:07:02 +02:00
Christophe Battarel
292373cf84 forgot new discount field 2016-04-11 17:43:10 +02:00
Christophe Battarel
983b2c9a21 FIX: real min buying price 2016-04-11 17:40:47 +02:00
Christophe Battarel
791df0c9ea FIX: correct display of minimum buying price 2016-04-11 17:27:34 +02:00
Laurent Destailleur
3678e05270 Mutualize code by moving getter into parent class. 2016-04-11 16:36:00 +02:00