Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-23 13:24:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,072 Commits 39 Branches 191 Tags
afee39ea68ea5eaad940149d6bf0fad1294de229
Commit Graph

8469 Commits

Author SHA1 Message Date
Laurent Destailleur
cb660cba86 NEW More filter on bank transaction list 2016-08-30 18:10:30 +02:00
Laurent Destailleur
b06cc18568 Fix sort on amount 2016-08-30 11:53:42 +02:00
aspangaro
b85e9938e8 Fix: VATArea - Problem of presentation 2016-08-30 05:17:27 +02:00
Laurent Destailleur
216f7dbaee Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-30 00:21:56 +02:00
Laurent Destailleur
d7007bd16b Fix lang not loaded 2016-08-30 00:21:26 +02:00
aspangaro
cfcd9677f1 Fix: Missing language key 2016-08-29 21:54:52 +02:00
aspangaro
358bcee3a5 Presentation on financiel account 2016-08-29 21:49:34 +02:00
aspangaro
31a895dddc Merge remote-tracking branch 'Upstream/develop' into 5.0-p1 2016-08-29 21:21:10 +02:00
aspangaro
5eb0e4ad87 Fix: Presentation on salaries payment index 2016-08-29 21:14:11 +02:00
Laurent Destailleur
ff0b424f74 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-29 18:18:35 +02:00
Laurent Destailleur
6b7d509e44 Fix css 2016-08-29 18:12:53 +02:00
Laurent Destailleur
b43bd371fd Merge pull request #5666 from aspangaro/4.0-p45 
Fix: Wrong language key
 2016-08-29 17:47:49 +02:00
Laurent Destailleur
9c1ba67169 Fix css 2016-08-29 16:40:51 +02:00
aspangaro
14e6e705c3 Remove the old file of ventilation module - Replace by advanced accountancy module 2016-08-29 07:44:09 +02:00
aspangaro
7cb4f85f6b Fix: Wrong language key 2016-08-29 07:30:39 +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
phf
7813f0be27 Fix deprecated value given to dol_print_date 2016-08-25 10:07:19 +02:00
Laurent Destailleur
e22e243bc5 NEW Can set to paid automaically social or fiscal contributions after a 
payment was recorded.
 2016-08-22 14:31:15 +02:00
Laurent Destailleur
03c30c487c Uniformise code 2016-08-22 13:46:38 +02:00
Laurent Destailleur
317132fea4 CSS 2016-08-22 12:25:54 +02:00
Laurent Destailleur
f06545a3fe Fix cancel button ignored 2016-08-19 17:22:53 +02:00
Laurent Destailleur
83107746ad Fix no way to fix the ref of recurring invoice when an error was done 
into typing.
 2016-08-19 16:18:39 +02:00
BENKE Charlie
45a0df53d8 Update facture.class.php 2016-08-17 16:42:02 +02:00
Laurent Destailleur
88afc4ad5a Merge pull request #5625 from aspangaro/4.0-p42 
Uniformize presentation, add button cancel everywhere
 2016-08-17 16:11:59 +02:00
Laurent Destailleur
47489265b1 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-17 11:15:30 +02:00
aspangaro
b7420372b7 Uniformize presentation, add button cancel everywhere 2016-08-12 22:53:30 +02:00
Juanjo Menent
adc0a73e93 Merge pull request #5603 from atm-florian/4.0_FIX_Multicurrency_with_french_number_setting 
FIX : MULTICURRENCY if value is 1,56 then GETPOST 'int' check return ''
 2016-08-11 20:42:25 +02:00
Laurent Destailleur
86c90ade3f Another fix on bank account missing when bank module enabled. 2016-08-11 18:41:31 +02:00
Laurent Destailleur
4df9af1ba0 Fix several errors with bank account module enabled on sale tax edition 2016-08-11 18:18:03 +02:00
Laurent Destailleur
f674b24945 Fix look and feel 2016-08-11 17:23:42 +02:00
florian HENRY
5bb3b5c074 FIX : MULTICURRENCY if value is 1,56 then GETPOST 'int' check return '' 2016-08-10 09:47:25 +02:00
aspangaro
43ffb061ef FIX : Accountancy - BANK_DISABLE_DIRECT_INPUT Add an option 2016-08-10 08:07:27 +02:00
Laurent Destailleur
4d4fc87e2b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/product/stock/productlot_list.php
	htdocs/websites/index.php
 2016-08-09 13:26:08 +02:00
BENKE Charlie
025a0dc0b4 Update facture.class.php 2016-08-07 14:36:48 +02:00
Laurent Destailleur
bcd055b378 Move button to link to, in same part of code than code to output links. 2016-08-05 15:30:28 +02:00
Laurent Destailleur
890e6f59c8 NEW Support mass actions for proposals 2016-08-05 13:08:23 +02:00
Laurent Destailleur
782ab6a02b Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/modules/barcode/modules_barcode.class.php
	htdocs/product/admin/product.php
 2016-08-05 00:42:40 +02:00
Laurent Destailleur
7a7e7b330f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-04 11:58:11 +02:00
Laurent Destailleur
7f6e2a277a NEW Link between objects can be done on both side and on all objects 2016-08-04 11:57:37 +02:00
Laurent Destailleur
f0c75388cb Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/api_commande.class.php
	htdocs/compta/facture/class/api_invoice.class.php
	htdocs/product/class/api_product.class.php
	htdocs/societe/class/api_contact.class.php
	htdocs/societe/class/api_thirdparty.class.php
 2016-08-02 17:43:12 +02:00
Laurent Destailleur
86f576f8d3 Fix strict sql 2016-08-02 13:45:35 +02:00
Laurent Destailleur
dfc38351ef Fix $i not initialized 2016-08-01 19:48:39 +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
bb99209b5e Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-01 15:06:22 +02:00
Laurent Destailleur
621a7d93fa Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-08-01 15:05:57 +02:00
Laurent Destailleur
97dd1f4bbb Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/filefunc.inc.php
 2016-08-01 15:03:59 +02:00
BENKE Charlie
9a0494bd64 Update bonprelevement.class.php 2016-08-01 14:11:58 +02:00
aspangaro
8ce5fcd980 Uniformize presentation salary payment 2016-08-01 07:40:05 +02:00
aspangaro
4a0eb496fa Merge remote-tracking branch 'Upstream/4.0' into 4.0-p36 
Conflicts:
	htdocs/societe/rib.php
 2016-08-01 07:27:49 +02:00