lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
56,883 Commits 43 Branches 150 Tags 886 MiB
9f045eb996
Commit Graph

6584 Commits

Author SHA1 Message Date
Laurent Destailleur
4cf4090cde Css 2016-10-17 00:21:39 +02:00
Laurent Destailleur
2592b4cba4 Fix field required only faor cheque payment mode 2016-10-16 21:39:19 +02:00
Laurent Destailleur
912ac8e3d6 Fix css 2016-10-16 21:29:12 +02:00
Laurent Destailleur
28933c31dd Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/projet/card.php
 2016-10-16 19:04:33 +02:00
aspangaro
380ab8bfa5 Fix: Show Ref/rowid of loan 2016-10-15 07:05:53 +02:00
aspangaro
849e46ab1d Merge remote-tracking branch 'Upstream/develop' into 5.0-p21 2016-10-15 05:59:11 +02:00
aspangaro
38c75ffeb0 Fix: Missing td in list of bank account. 2016-10-15 05:57:10 +02:00
Laurent Destailleur
dfbca2d0ad Merge pull request #5868 from olsesacl/#5830 
NEW: #5830 Allow Generic E-mail Sender
 2016-10-15 02:43:19 +02:00
Laurent Destailleur
d27dea8320 NEW Can rename uploaded or generated files on all "documents" tabs. 2016-10-14 18:09:24 +02:00
Laurent Destailleur
a7c6ecc177 Fix better compatibility with multicompany 2016-10-14 16:05:25 +02:00
Sergio Sanchis
63a7b506b1 Fix: Error if exist extrafield 2016-10-14 10:55:54 +02:00
Laurent Destailleur
28f64e78eb Debug multicurrency 2016-10-13 21:25:13 +02:00
Laurent Destailleur
78e8ab64aa Debug multicurrency 2016-10-13 21:17:46 +02:00
Sergio Sanchis Climent
8556dab68e NEW: #5830 2016-10-13 16:44:17 +02:00
Laurent Destailleur
94c5b40c51 Add warning 2016-10-10 21:22:28 +02:00
Laurent Destailleur
03876ba637 Merge pull request #5773 from atm-gauthier/NEW_reopen_bills_is_a_distinct_right 
NEW : Reopen a paid bill is a user right
 2016-10-07 13:31:10 +02:00
Laurent Destailleur
c908af6758 Merge pull request #5833 from atm-gauthier/develop_NEW_cdr_current_or_next_month 
NEW Develop new cdr (current or next month) for payment terms.
 2016-10-07 00:06:59 +02:00
Laurent Destailleur
611f1bcf89 Merge pull request #5836 from yanntech/fix/postgresql 
replace double quote per simple quote in update_frequency SQL
 2016-10-07 00:01:31 +02:00
Laurent Destailleur
93c848fcc5 Add page index for accountancy module 2016-10-06 17:43:10 +02:00
Laurent Destailleur
c982409c72 Fix a deadlock feature 2016-10-06 15:29:10 +02:00
Laurent Destailleur
db3e3642b0 NEW Can generate SEPA mandate for each bank account of your customers 2016-10-06 00:14:25 +02:00
Laurent Destailleur
e79a84a89b Uniformize code 2016-10-05 21:49:04 +02:00
Yann Verry
f4347ec60e replace double quote per simple quote in update_frequency SQL 
Fix #5835
 2016-10-04 21:56:53 +02:00
Laurent Destailleur
31ce725d73 Maxi debug of accountancy expert module 2016-10-04 19:31:05 +02:00
gauthier
b35a4eb1b2 Merge branch 'NEW_cdr_current_or_next_month' of github.com:atm-gauthier/dolibarr into develop_NEW_cdr_current_or_next_month 2016-10-04 16:01:26 +02:00
gauthier
1c98979ca1 NEW : option "Current/Next" for limit payment date (in payment terms) to use a specific day of current month or jump to same day of next month 2016-10-04 15:45:23 +02:00
Laurent Destailleur
1e3038d634 Debug reports 2016-10-04 13:57:25 +02:00
Laurent Destailleur
3599f2c840 Uniformize code for recurring invoices 2016-10-04 12:31:45 +02:00
Laurent Destailleur
053e6783db Fix INVOICE_US_SITUATION into INVOICE_USE_SITUATION 2016-10-04 11:30:51 +02:00
Laurent Destailleur
d81cd7ebbe NEW Can link template invoice to other objects. Generated invoice will 
be linked to same objects.
 2016-10-04 11:14:00 +02:00
Laurent Destailleur
6ac39b97e4 Fix restore list of attached files into action report 2016-10-03 00:38:28 +02:00
Laurent Destailleur
a52ad545eb Enhancement on module Direct Debit SEPA. 2016-10-02 13:03:45 +02:00
Laurent Destailleur
ee252f549a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	dev/skeletons/skeleton_list.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/lib/cron.lib.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
 2016-10-01 18:42:50 +02:00
Laurent Destailleur
03c60f1b7d FIX #5802 Incoterms not set 2016-10-01 13:55:07 +02:00
Laurent Destailleur
5c9fa28e79 Fix search on invoice type 2016-09-29 10:38:15 +02:00
gauthier
03d126810c FIX : "reopen " new right must respect advanced user rights management 2016-09-29 10:15:34 +02:00
aspangaro
31511a601d Disable by default 2016-09-29 07:03:39 +02:00
aspangaro
210601f78b New: Add type invoice in customer search list 2016-09-29 07:01:58 +02:00
Laurent Destailleur
b2307f9b90 Uniformize code 2016-09-28 21:08:25 +02:00
Laurent Destailleur
ce1f57786a Merge pull request #5794 from mrsof/develop 
NEW add confirm on reapeatable/template invoice deletion
 2016-09-28 20:01:39 +02:00
Laurent Destailleur
05b1528029 Merge pull request #5800 from atm-gauthier/NEW_filters_on_ca_report 
NEW : add fields and filters on ca by third report
 2016-09-28 20:00:16 +02:00
Laurent Destailleur
e4f17c8763 FIX #5793 Normalise code. 2016-09-28 17:56:54 +02:00
gauthier
e82f65cef2 NEW : add field and filters on ca by third report 2016-09-27 17:38:54 +02:00
Sof
23dffa33a6 Fix : email adress 2016-09-26 19:32:31 +02:00
Sof
86a06de015 New : add confirm on invoice deletion 
Alternatively reformated all code
 2016-09-26 19:29:54 +02:00
gauthier
ad03bdf3b9 FIX : reopen invoice is an advanced right and default value is 1 2016-09-26 17:39:46 +02:00
Laurent Destailleur
e92184a738 Fix bad var $db 2016-09-26 14:55:36 +02:00
Laurent Destailleur
9b26db4151 Fix remove var_dump 2016-09-26 14:55:10 +02:00
Laurent Destailleur
6232e59fd2 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-26 14:17:36 +02:00
Laurent Destailleur
b50d92e712 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/compta/localtax/index.php
 2016-09-26 14:16:53 +02:00
Laurent Destailleur
5d7f182f59 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-26 14:14:56 +02:00
Laurent Destailleur
67a1bf2b59 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-09-26 14:13:26 +02:00
Laurent Destailleur
3cb13e16d1 Merge branch 'rest-api-add-accounts' of 
https://github.com/EuskalMoneta/dolibarr into
EuskalMoneta-rest-api-add-accounts

Conflicts:
	htdocs/api/index.php
	htdocs/commande/class/api_orders.class.php
 2016-09-26 02:28:16 +02:00
Laurent Destailleur
d39d7d92c9 Uniformize code. 2016-09-26 02:13:58 +02:00
Laurent Destailleur
100312aac2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/adherents/class/cotisation.class.php
 2016-09-26 01:32:50 +02:00
Laurent Destailleur
813f9120f6 Merge pull request #5781 from aspangaro/5.0-p15 
Typo "Execuete"
 2016-09-26 00:51:40 +02:00
Laurent Destailleur
ea09eb13da Uniformize code 2016-09-26 00:10:29 +02:00
Xebax
fe2498ffc1 Fix coding style errors. 2016-09-25 19:11:16 +02:00
Xebax
58179f71fc Add Accounts to REST API. 2016-09-25 17:48:48 +02:00
aspangaro
8dc6a8fd1d Correct presentation 2016-09-24 14:47:51 +02:00
aspangaro
922495d72d Correct travis & typo "Execuete" 2016-09-24 07:18:38 +02:00
gauthier
7ad2fda289 NEW : Reopen a paid bill is a user right 2016-09-22 15:06:39 +02:00
Laurent Destailleur
37a0df3277 Merge pull request #5761 from abilbaotm/patch-1 
Fix Syntax error, unrecognized expression: input.remain]
 2016-09-22 09:10:25 +02:00
Laurent Destailleur
d4e324d15a Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture.php
 2016-09-21 18:38:30 +02:00
Laurent Destailleur
d759296c02 Fix color of amount 2016-09-21 01:39:05 +02:00
Laurent Destailleur
1c15539bb4 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-21 01:27:25 +02:00
Laurent Destailleur
133657a8c7 Uniformize code 2016-09-21 01:25:34 +02:00
Laurent Destailleur
b5dad8cfbf Better responsive 2016-09-21 00:29:19 +02:00
Laurent Destailleur
c2f4bc90ab NEW Can sort on status reccurin invoice in list of template invoices. 2016-09-19 16:52:33 +02:00
Laurent Destailleur
64dc44b796 FIX Value of payment term and project are not set on correct default 
value when invoice generated from template.
 2016-09-19 16:27:01 +02:00
Laurent Destailleur
4f842fd2cb Uniformize look and feel 2016-09-19 13:57:50 +02:00
Laurent Destailleur
95f2cae825 Start to work on sepa mandate generation 2016-09-19 00:26:30 +02:00
Laurent Destailleur
c8b8e13014 Work on dol_banner for proposals. 2016-09-18 21:38:20 +02:00
Laurent Destailleur
537c6b0cc7 Uniformize code 2016-09-18 15:57:53 +02:00
Asier Bilbao
0a9fd2dc7e Fix Syntax error, unrecognized expression: input.remain] 
Fix
```
 jquery.min.js?version=4.0.0:2 Uncaught Error: Syntax error, unrecognized expression: input.remain]
```
 2016-09-18 15:51:55 +02:00
Laurent Destailleur
13c3db08e7 Uniformize code and look and feel 2016-09-18 15:48:29 +02:00
Laurent Destailleur
5146a0ce56 Fix filter on num account statement 2016-09-14 21:29:08 +02:00
Laurent Destailleur
145c1e1cc8 NEW Add account statement into fields of bank account transaction list 2016-09-14 21:26:57 +02:00
Laurent Destailleur
630aab9124 NEW Can select fields to show on list of bank transaction 2016-09-14 21:06:16 +02:00
Laurent Destailleur
39d47eab18 NEW Introduce option MAIN_DEFAULT_PAYMENT_TERM_ID to set default payment 
term on company level.
 2016-09-14 11:17:44 +02:00
Laurent Destailleur
2facdda690 Uniformize code 2016-09-12 21:54:45 +02:00
Laurent Destailleur
0ab377440d Complete param of setValueFrom 2016-09-12 20:16:39 +02:00
Laurent Destailleur
4096981378 FIX #3128 2016-09-12 03:10:18 +02:00
Laurent Destailleur
3d8722ee69 FIX #2853 2016-09-12 02:19:25 +02:00
Laurent Destailleur
9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/card.php
	htdocs/product/stock/class/productlot.class.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 02:05:38 +02:00
Laurent Destailleur
1fbf233f95 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/expedition/list.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/list.php
	htdocs/product/reassort.php
	htdocs/product/reassortlot.php
	htdocs/product/stock/list.php
	htdocs/societe/list.php
	htdocs/supplier_proposal/list.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 01:50:38 +02:00
Laurent Destailleur
9252914a09 Fix avoid useless param if not defined 2016-09-11 13:30:14 +02:00
Laurent Destailleur
1ef0409b28 Merge pull request #5693 from atm-florian/dev_projectwork 
Add projectid into link create from
 2016-09-11 13:26:22 +02:00
Laurent Destailleur
926e3fc6f9 Fix date must be with standard format 2016-09-10 17:43:28 +02:00
Laurent Destailleur
41545e0d60 Fix compatibility of recurring invoices with postgresql 2016-09-10 05:26:31 +02:00
Laurent Destailleur
7c9996c840 Fix when creating recurring invoice, date next gen was not set 2016-09-10 05:25:07 +02:00
Laurent Destailleur
d821df070b Fix multicompany: recurring invoice must be in same env than template. 2016-09-10 04:33:23 +02:00
Ferran Marcet
b5db70342b Fix: Search all is lost on lists when pagination or when the columns are sorted 2016-09-09 13:58:41 +02:00
Laurent Destailleur
0debcf745a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/cron/card.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
 2016-09-09 09:32:14 +02:00
Laurent Destailleur
4fe4907b44 FIX Mandatory field payment term was not css highlighted. 2016-09-08 18:13:23 +02:00
Laurent Destailleur
6d6eceb0ca Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-08 11:39:38 +02:00
florian HENRY
8319d1f70a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_projectwork 2016-09-05 08:31:40 +02:00
Laurent Destailleur
f440e78fa6 FIX quick search boxes when nojs or when using smartphone 2016-09-03 12:56:49 +02:00
Laurent Destailleur
b107b0644f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-02 22:07:17 +02:00
florian HENRY
d360ff1d6c Add projectid into link create from 2016-09-02 15:16:30 +02:00
philippe grand
959f4d0ba0 internationalized comments 2016-09-01 19:44:49 +02:00
Laurent Destailleur
91ede48390 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-01 11:37:40 +02:00
Laurent Destailleur
10ced563b3 Fix var $conf not defined 2016-08-31 19:39:12 +02:00
Laurent Destailleur
292993c14f Fix var $conf not defined 2016-08-31 19:37:34 +02:00
Laurent Destailleur
545bc9d33d Fix var conf not defined. 2016-08-31 19:36:21 +02:00
Laurent Destailleur
56d6510472 Fix Quick hack to solve legal problem in some countries. 2016-08-31 18:36:32 +02:00
Laurent Destailleur
8fd082cf16 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/hrm/hrm.php
 2016-08-31 16:16:19 +02:00
Laurent Destailleur
95c2133b07 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-31 12:39:17 +02:00
Laurent Destailleur
8cfac3b5c3 FIX Several problems when using smartphone 2016-08-31 12:38:54 +02:00
aspangaro
3892f295c7 Uniformize presentation of customer's invoice 2016-08-31 06:27:35 +02:00
Juanjo Menent
ea6daeebbb Merge pull request #5675 from aspangaro/4.0-p46 
Fix: VAT Area - Problem of presentation
 2016-08-31 02:12:19 +02:00
Juanjo Menent
1f67b025d7 Merge pull request #5672 from aspangaro/5.0-p4 
Fix: Missing language key
 2016-08-31 02:09:55 +02:00
Juanjo Menent
8155c09d49 Merge pull request #5671 from aspangaro/5.0-p3 
Fix: Presentation on financial account
 2016-08-31 02:08:33 +02:00
Juanjo Menent
eb23c8880d Merge pull request #5670 from aspangaro/5.0-p1 
Fix: Presentation on salaries payment index
 2016-08-31 02:07:11 +02:00
Juanjo Menent
bb71e818dc Merge pull request #5667 from aspangaro/5.0-p2 
Remove the old file of ventilation module - Replace by advanced accou…
 2016-08-31 02:06:28 +02:00
Laurent Destailleur
524dd79198 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/bank/search.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/tasks/time.php
 2016-08-31 00:16:07 +02:00
Laurent Destailleur
124df446d7 Fix remove log 2016-08-30 18:12:26 +02:00
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