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

6393 Commits

Author SHA1 Message Date
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
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
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
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
aspangaro
3cdb2d45c2 Uniformize presentation customer invoice 2016-08-01 07:10:42 +02:00
Laurent Destailleur
33495847b7 Merge branch '4.0-p36' of https://github.com/aspangaro/dolibarr into 
aspangaro-4.0-p36

Conflicts:
	htdocs/societe/rib.php
 2016-07-31 03:05:34 +02:00
Laurent Destailleur
e5583f1544 Fix bad translation. Confusionbetween internal tranfert and bank 
tranfert for payements
 2016-07-30 17:28:18 +02:00
Laurent Destailleur
857de64607 Fix multicurrency 2016-07-30 16:41:10 +02:00
Laurent Destailleur
5b4c215526 Fix size of field too small and bad translation 2016-07-30 10:31:56 +02:00
aspangaro
3c3df0c4f6 Fix Presentation 2016-07-29 23:52:49 +02:00
Laurent Destailleur
69247afd06 FIX #4447 2016-07-29 17:26:24 +02:00
Laurent Destailleur
b85bb8c0f8 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2016-07-29 16:24:02 +02:00
Laurent Destailleur
80ac99e9b1 Fix missing field into response 2016-07-28 23:50:17 +02:00
Ferran Marcet
5bc51a3439 FIX: Can't create withdrawal document 2016-07-28 16:56:23 +02:00
Laurent Destailleur
fb8f0ed657 FIX #5503 2016-07-27 20:05:22 +02:00
Laurent Destailleur
e0f5a3cfe9 Fix send email in mass action 2016-07-25 21:51:29 +02:00
Regis Houssin
d8f77abf31 Fix: missing sourcetype can create fault positive 2016-07-25 14:36:20 +02:00
Laurent Destailleur
5bbd8eded9 Code comment 2016-07-22 18:32:45 +02:00
Laurent Destailleur
774e327831 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/comm/remx.php
	htdocs/compta/facture.php
	htdocs/langs/en_US/companies.lang
 2016-07-21 10:30:51 +02:00
florian HENRY
5ea72c8d56 FIX : cannot update bank account on invoice if module order not 
activated
 2016-07-19 07:46:27 +02:00
Laurent Destailleur
621a29d0e0 Fix account may contains text 2016-07-18 12:01:25 +02:00
Juanjo Menent
e5235be7d0 Merge pull request #5500 from atm-florian/4.0_fix_updateline_multicurrency 
FIX : class FactureLine fetch() and update() crash
 2016-07-18 08:56:15 +02:00
florian HENRY
d3344f5291 sd 2016-07-18 07:48:32 +02:00
florian HENRY
bc4674bdce fix problem with call update method after fetch on invocie lines 2016-07-18 07:37:18 +02:00
aspangaro
e6da7c5574 Fix: Accountancy - Problem with empty accountancy acccount in create / modify mode 2016-07-17 07:09:17 +02:00
Laurent Destailleur
4b854fb33d Fix better error message when possible refering objects list is empty. 2016-07-16 14:37:35 +02:00
Juanjo Menent
df74fa37de Merge pull request #5464 from AppChecker/develop 
Fix: Prevent SQLi
 2016-07-13 08:45:00 +02:00
Laurent Destailleur
73f574b649 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/repair.php
 2016-07-12 19:30:01 +02:00
Alexis Algoud
572b2fdec7 FIX dasboard wrong for late invoice 2016-07-12 15:01:43 +02:00
appchecker
f618f330b3 replace intval with GETPOST 2016-07-11 13:01:16 +03:00
appchecker
2c297bbcc8 prevent SQLi 2016-07-07 20:25:15 +03:00
Laurent Destailleur
6749e60079 Fix: Test to manage corrupted data 2016-07-05 18:36:10 +02:00
Laurent Destailleur
a669b61b69 Code comment 2016-07-05 18:33:13 +02:00
Laurent Destailleur
b4c8822281 Fix style of text after ref on invoices 2016-07-05 16:27:14 +02:00
Laurent Destailleur
76d24ac8ca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-02 11:27:13 +02:00
Laurent Destailleur
91d2d573c3 Fix NNE has been replaced with ICS 2016-07-02 11:26:55 +02:00
Laurent Destailleur
05384b2f88 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/list.php
	htdocs/projet/card.php
	htdocs/societe/consumption.php
 2016-07-01 02:39:29 +02:00
Laurent Destailleur
29e26c2342 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/lib/sendings.lib.php
 2016-07-01 02:06:30 +02:00
Laurent Destailleur
5c11192c7c Merge pull request #5425 from atm-arnaud/fix_4749 
FIX #4749
 2016-06-30 22:20:18 +02:00
florian HENRY
215f397f33 Cannot reproduce 4793 still fix other bug on PgSQL 2016-06-30 17:28:13 +02:00
Maxime Kohlhaas
d004f3a538 FIX #4448 $filebonprev is not used, $this->filename now 2016-06-30 17:03:56 +02:00
arnaud
0ffe106e2c FIX #4749 2016-06-30 16:03:48 +02:00
Laurent Destailleur
8bcd2e581f Fix of bugs reported by scrutinizer 2016-06-29 11:20:48 +02:00
Laurent Destailleur
2c97d0855a Fix: On template invoice, edition of line was not complete. 2016-06-28 17:51:29 +02:00
Laurent Destailleur
b529a53501 Fix var not initialized 2016-06-28 02:36:40 +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
Laurent Destailleur
1368e6d462 Fix: error message was not enough to understand 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2016-06-24 21:32:38 +02:00
Laurent Destailleur
f97b67db6b Fix: error message was not enough to understand 2016-06-24 17:04:59 +02:00
Laurent Destailleur
e144df759c FIX forced bank account was lost on proposal 
Fix Invoice was using duplicated bugged code for pdf removal link.
 2016-06-24 12:50:50 +02:00
Laurent Destailleur
3b38e5a870 FIX Withdraw request should not be possible if amount is negative. 2016-06-24 03:00:34 +02:00
Laurent Destailleur
2e4c6597d8 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
 2016-06-23 21:05:00 +02:00
Laurent Destailleur
f6119cfee8 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
 2016-06-23 21:03:08 +02:00
Laurent Destailleur
9b50150fe8 FIX #5380 2016-06-23 20:54:04 +02:00
Laurent Destailleur
4a408e76e7 Fix download of mass generated files. 2016-06-22 21:06:08 +02:00
Juanjo Menent
0d62bd704e Fix: Bad column totalizing if MAIN_SHOW_HT_ON_SUMMARY activated 2016-06-22 18:59:51 +02:00
Laurent Destailleur
52f414ad73 Fix selection of visible fields on customer and supplier lists. Filters 
are ok now. Order of list of fields in selection is same than in output
array.
 2016-06-21 15:16:33 +02:00
Laurent Destailleur
b953e8f364 Minor fix 2016-06-21 12:15:41 +02:00
Laurent Destailleur
73fb7b2615 Fix phpunit regression. phpunit test on ws invoice is cleaner. 2016-06-21 01:07:44 +02:00
Laurent Destailleur
b01eed697e Fix sort on thirdparty on bank transaction list 2016-06-20 11:30:43 +02:00
Laurent Destailleur
8187dc2006 Fix css 2016-06-19 16:07:34 +02:00
Laurent Destailleur
4a6427134f Merge pull request #5367 from atm-florian/develop 
FIX bug with PgSQL on GROUP BY missing column
 2016-06-18 18:09:43 +02:00
Laurent Destailleur
4382f2a437 Clean language files 2016-06-18 11:06:11 +02:00
florian HENRY
d94953c4d7 FIX bug with PgSQL on GROUP BY missing column 2016-06-17 13:33:48 +02:00
Raphaël Doursenaud
eb54c3f8af
Fix #5350 date_pointoftax prevented creating invoices 2016-06-16 13:09:11 +02:00
Laurent Destailleur
232f525f29 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2016-06-15 18:31:43 +02:00
Laurent Destailleur
630a063283 FIX Can't create thirdparty or validate invoice if profid is mandatory 
and profid does not exists for other countries

Conflicts:
	htdocs/compta/facture.php
 2016-06-15 18:24:15 +02:00
Laurent Destailleur
4c922f073b FIX Can't create thirdparty or validate invoice if profid is mandatory 
and profid does not exists for other countries
 2016-06-15 18:21:58 +02:00
Laurent Destailleur
44503cb43c Fix missing "back to list" link 2016-06-14 20:49:34 +02:00
Laurent Destailleur
6034ba658c Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-06-10 18:59:05 +02:00
Laurent Destailleur
fd4973c413 Fix missing total 2016-06-09 07:50:54 +02:00
Laurent Destailleur
9019576394 Fix css class opacitymedium was not used everywhere. 2016-06-07 15:58:02 +02:00
Laurent Destailleur
ad001ed4dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-07 14:06:17 +02:00
Laurent Destailleur
5db6bcd4a8 Fix contextpage lost on submitting form or sorting 2016-06-07 14:06:00 +02:00
Laurent Destailleur
18f1ee1685 Merge pull request #5316 from atm-gauthier/develop_fix_deplacement_list 
FIX : if user is only allowed to see his companies, he must be allowe…
 2016-06-07 00:43:17 +02:00
Laurent Destailleur
a8541fcaeb Merge pull request #5315 from atm-gauthier/develop_fix_usercard_link_on_deplacement 
FIX : wrong id user deplacement links
 2016-06-07 00:27:08 +02:00
Laurent Destailleur
559c1aa010 Fix alignetment of title in some arrays 2016-06-06 16:37:18 +02:00
Laurent Destailleur
fb13225173 Fix links on list from warnings dashboard 2016-06-06 16:31:50 +02:00
gauthier
07d07d522a FIX : if user is only allowed to see his companies, he must be allowed to see deplacement which are not linked to a company 2016-06-06 16:31:42 +02:00
gauthier
b153ae8c6b FIX : wrong id user deplacement links 2016-06-06 16:12:27 +02:00
Laurent Destailleur
47308d27c3 Missing column import_key and import for vat payments 2016-06-06 14:37:06 +02:00
Laurent Destailleur
4416925a85 Merge pull request #5314 from fmarcet/peru 
Fix: Missing userid on query
 2016-06-06 13:40:20 +02:00
Laurent Destailleur
293534273f Merge pull request #5313 from aspangaro/4.0-p33 
Fix: colspan in vat list of payments
 2016-06-06 13:39:07 +02:00
Your Name
68fa27ec03 Fix: Missing userid on query 2016-06-06 12:00:24 +02:00
Laurent Destailleur
9c88eadbe4 Fix: button to generate invoice manually must be disabled if we reach 
max number of generation.
 2016-06-06 11:48:39 +02:00
Laurent Destailleur
a0458be943 Fix object not defined 2016-06-06 11:25:54 +02:00
aspangaro
3b3567a718 Fix: colspan 2016-06-05 15:50:32 +02:00
Laurent Destailleur
293c8e145a Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/imports/import.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 02:20:27 +02:00
Laurent Destailleur
c09dbe05b3 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/class/ldap.class.php
	htdocs/expensereport/card.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 00:25:08 +02:00
Laurent Destailleur
c59c86e648 Merge branch 'develop' of https://github.com/aschio/dolibarr into 
develop

Conflicts:
	htdocs/fourn/facture/list.php
 2016-06-04 14:55:02 +02:00
Maxime Kohlhaas
bd2fe75d08 Fix menus in dashboard links 2016-06-04 14:45:03 +02:00
Laurent Destailleur
674164b71c Add a better explanation on job generation 2016-06-04 14:30:05 +02:00
Laurent Destailleur
975d9357fa FIX On recurring invoice, when generation is done manually from card, 
counter of number of generation must be +1
 2016-06-04 14:08:57 +02:00
Juanjo Menent
43d475aa42 Merge pull request #5272 from simnandez/3.9 
Fix issues with strict mode
 2016-06-04 10:07:01 +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
Laurent Destailleur
085fa6902b Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/contrat/list.php
	htdocs/fourn/ajax/getSupplierPrices.php
 2016-06-04 00:58:16 +02:00
Juanjo Menent
66c73015b2 Fix issues with strict mode 2016-06-03 23:58:54 +02:00
Laurent Destailleur
448c394f2a Fix date of recurrin invoice 2016-06-03 22:10:33 +02:00
Laurent Destailleur
a5d7c303e7 FIX Button must be out of tabs 2016-06-02 21:11:14 +02:00
Laurent Destailleur
028ff5e84c Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/card.php
	htdocs/langs/en_US/products.lang
	htdocs/societe/list.php
 2016-06-01 17:59:50 +02:00
Laurent Destailleur
7519c4a602 FIX Log of tax 
FIX Missing import key on social contributions and missing class to
manage type of social contributions.
 2016-06-01 13:24:27 +02:00
Laurent Destailleur
460d7ce915 FIX Split of credit note into discount page generates records not 
correctly recognised as credit note.
 2016-05-30 19:38:28 +02:00
Laurent Destailleur
2dcc578b88 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-30 00:52:59 +02:00
Laurent Destailleur
3ddf427ff1 FIX Legal issue for GB. Add hidden option for this. 2016-05-30 00:52:16 +02:00
Laurent Destailleur
0c6e8b626a Fix var not initialized 2016-05-29 11:20:27 +02:00
gauthier
71ee941cf8 FIX : SQL error function on getAvailableDiscounts function, on bill create mode if socid is empty 2016-05-25 12:25:39 +02:00
Laurent Destailleur
3abe1d8e81 Merge pull request #5220 from fmarcet/expenses 
The approved status is enough to expense appear in the report
 2016-05-22 14:22:38 +02:00
Laurent Destailleur
7935967c62 Fix duplicate translation key 2016-05-21 12:30:58 +02:00
Your Name
106f456c6b Last change 2016-05-19 16:50:18 +02:00
Laurent Destailleur
400572e18a Fix column size 2016-05-18 21:04:37 +02:00
Laurent Destailleur
4c2098b667 Fix duplicate table title 2016-05-18 20:58:29 +02:00
Laurent Destailleur
7cca4f3e8a Merge pull request #5211 from defrance/patch-4 
enhance rappro feature
 2016-05-18 20:38:07 +02:00
Your Name
c2b958a039 Correction compatibility Postgresql 2016-05-18 18:52:38 +02:00
Your Name
23311cdba1 Merge remote-tracking branch 'origin/develop' into expenses 2016-05-18 18:46:05 +02:00
Laurent Destailleur
acae888b3a Fix phpunits 2016-05-17 23:38:07 +02:00
Your Name
c30a3a5f7e Expense report grouped by user 2016-05-17 10:02:36 +02:00
Laurent Destailleur
f9ded46a99 Start debug 4.0 2016-05-17 02:41:06 +02:00
Your Name
e1fa86914e The approved status is enough to expense appear in the report 2016-05-16 18:41:41 +02:00
BENKE Charlie
a1ce4000e1 NEW : Add list of billed 
Very usefull when we have many rappro
Maybe do the same on other paiement
 2016-05-14 10:14:10 +02:00
BENKE Charlie
0944463805 Add : rappro order list 2016-05-14 10:06:35 +02:00
Laurent Destailleur
6bb269381a Merge pull request #5143 from frederic34/morecateg 
categories account like other categories
 2016-05-07 20:25:17 +02:00
Juanjo Menent
fd6dbf5d1a Fix Remove unused variables 2016-05-06 22:59:03 +02:00
Frédéric FRANCE
2f3a2303d4 put colspan in td instead tr 2016-05-04 16:49:15 +02:00
Laurent Destailleur
a8363052c6 Better style 2016-04-30 15:55:39 +02:00
frederic34
17463b4927 categories account like other categories 2016-04-30 14:45:24 +02:00
Laurent Destailleur
e61e717cac FIX Bad permission to edit bank account on customer invoice 2016-04-30 14:28:48 +02:00
Laurent Destailleur
6ffb45f5d8 FIX Missing param user on update() 2016-04-30 13:58:35 +02:00
Laurent Destailleur
0cde6ad98f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2016-04-29 20:43:42 +02:00
Laurent Destailleur
3d9456b202 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/facture/list.php
 2016-04-29 20:42:35 +02:00
Laurent Destailleur
53386e22ea Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/expedition/class/expedition.class.php
	htdocs/index.php
 2016-04-29 20:39:17 +02:00
Laurent Destailleur
b0b1056a44 Merge pull request #5121 from fmarcet/3.7 
Fix: Not filtering correctly on supplier invoice's list
 2016-04-29 17:19:15 +02:00
Juanjo Menent
6d58103d11 Merge pull request #5091 from marcosgdf/fr-4972 
NEW #4972 Translated Charges sociales (type 0) and Charges sociales (type 1) in reports page
 2016-04-29 12:03:04 +02:00
Juanjo Menent
08a875b813 Merge pull request #5084 from atm-maxime/new_remaintopay_invoice_list 
New add remain to pay column in invoice list
 2016-04-29 12:00:53 +02:00
Juanjo Menent
a33df1401b Merge pull request #5079 from marcosgdf/fix-undefined-variable 
Fixed undefined $user variable in Account::countAccountToReconcile
 2016-04-29 11:58:48 +02:00
Juanjo Menent
9909143c42 Merge pull request #5076 from aspangaro/4.0-p21 
FIX: For external api, don't use lengt_accountg without module accountancy activated
 2016-04-29 11:55:55 +02:00
fmarcet
33499ae652 FIX: Compatible with multicompany 2016-04-28 11:14:00 +02:00
Maxime Kohlhaas
0a67614e72 Fix wrong qty total in ca by prod/serv report 2016-04-28 09:10:22 +02:00
Laurent Destailleur
aa31a7e9c5 Finished list of template invoices 2016-04-27 20:09:55 +02:00