Laurent Destailleur
65edc377c3
FIX Visible date of payment
2020-12-30 22:53:21 +01:00
Laurent Destailleur
42ca3bcdc7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/salaries/class/paymentsalary.class.php
2020-12-30 13:23:50 +01:00
Laurent Destailleur
cb4a293020
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/webservices/server_productorservice.php
2020-12-30 13:22:43 +01:00
Laurent Destailleur
5a097b21e4
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/bank/various_payment/card.php
2020-12-30 13:21:33 +01:00
Laurent Destailleur
17b68a30d7
Merge branch 'develop' into dev_add_tag_on_massaction
2020-12-30 13:10:02 +01:00
Alexandre SPANGARO
a336e45098
FIX : #15751 Miscellaneous payment type change to 0 after updating subledger
2020-12-30 08:11:20 +01:00
Alexandre SPANGARO
0e2b7d8b3c
Remove typo
2020-12-30 07:23:26 +01:00
Florian HENRY
806b40662f
merge develop
2020-12-28 21:15:25 +01:00
lvessiller
d4a19e5968
NEW add total margin in invoice list
2020-12-28 16:20:59 +01:00
Laurent Destailleur
a6eb14f68b
Merge pull request #15585 from cfoellmann/fckeditor-notes
...
NEW Can toggle FCKeditor on public/private notes
2020-12-27 15:06:35 +01:00
Florian HENRY
1b6a4fc4ae
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_tag_on_massaction
2020-12-24 15:00:15 +01:00
Florian HENRY
f03574d061
bank ok
2020-12-24 14:56:26 +01:00
Laurent Destailleur
88e441412c
CSS
2020-12-24 01:35:59 +01:00
Laurent Destailleur
b66ec5bc64
Fix css
2020-12-23 23:16:27 +01:00
Laurent Destailleur
4471d7d1da
FIX debug report expense/income
2020-12-23 22:18:38 +01:00
Laurent Destailleur
d65dc85a10
FIX for php 8
2020-12-23 19:16:25 +01:00
Laurent Destailleur
bac2ae0d5f
Fix warnings
2020-12-22 17:33:17 +01:00
Laurent Destailleur
58b4de8bc3
More complete fix for #15712
2020-12-21 19:27:42 +01:00
Laurent Destailleur
8d901d03fd
Fix link
2020-12-21 16:01:47 +01:00
Laurent Destailleur
4ed14d4903
Fix title not saved
2020-12-19 18:52:05 +01:00
Laurent Destailleur
832db82fce
Fix warnings
2020-12-18 14:40:45 +01:00
Laurent Destailleur
3b8947dadd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/class/html.form.class.php
htdocs/product/price.php
2020-12-17 21:50:05 +01:00
Laurent Destailleur
5facd49a6c
Fix warnings
2020-12-16 11:33:31 +01:00
Laurent Destailleur
c6f83aaed7
Fix warning
2020-12-16 11:21:48 +01:00
Laurent Destailleur
2c7d872320
Fix warning
2020-12-16 11:07:34 +01:00
Laurent Destailleur
bf01ad8790
Fix warning
2020-12-16 10:55:33 +01:00
atm-lena
cb2c1f3ece
FIX Facture Situation Out : status condition
2020-12-16 10:54:32 +01:00
Laurent Destailleur
479e742d0c
FIX #15753
2020-12-15 13:46:13 +01:00
Laurent Destailleur
b991badb8c
Fix warning
2020-12-14 13:03:43 +01:00
Laurent Destailleur
d4167fb06c
Fix link
2020-12-14 11:35:45 +01:00
Laurent Destailleur
e1e8d76eb9
Fix bad filter
2020-12-14 11:30:39 +01:00
Laurent Destailleur
07cf81be17
Fix search and navigation
2020-12-14 11:28:18 +01:00
Laurent Destailleur
b0e3f1678f
Debug v13
2020-12-14 10:58:09 +01:00
Laurent Destailleur
cce0b2f31b
Fix code
2020-12-14 10:44:51 +01:00
Laurent Destailleur
3d33d3aa3a
Fix warning
2020-12-13 14:36:00 +01:00
Frédéric FRANCE
870f2073ad
fix warning
2020-12-11 22:13:30 +01:00
Laurent Destailleur
be163c684f
Fix phpcs
2020-12-10 12:54:13 +01:00
Laurent Destailleur
dac0267a38
Fix debug various payment module.
...
Fix debug report income/expense (for situation that should not happen
but if it happen, result is consistent with other screens).
2020-12-09 21:51:01 +01:00
Laurent Destailleur
51738e7e60
Fix links into translation strings
2020-12-09 17:02:26 +01:00
Laurent Destailleur
d9ba821411
Merge pull request #15669 from frederic34/template
...
typo ortho
2020-12-07 22:35:45 +01:00
Laurent Destailleur
2c094fe847
Merge pull request #15673 from frederic34/compta_stats_index
...
fix trans removing html
2020-12-07 22:32:12 +01:00
Laurent Destailleur
efc3bad7c6
Merge pull request #15678 from frederic34/fk_element
...
doxygen
2020-12-07 22:31:08 +01:00
Laurent Destailleur
a87ef49172
Fix remove warning
2020-12-06 17:59:49 +01:00
Frédéric FRANCE
4e18f46f28
doxygen
2020-12-05 23:53:55 +01:00
Frédéric FRANCE
7099dbbb05
fix trans removeing html
2020-12-05 18:17:04 +01:00
Frédéric FRANCE
d1204e5e9b
typo ortho
2020-12-05 15:35:52 +01:00
Laurent Destailleur
0db72852fb
Fix height of graph
2020-12-03 20:18:37 +01:00
Laurent Destailleur
d8d825f615
FIX #15519
2020-12-03 14:40:14 +01:00
Laurent Destailleur
5bd6d6f388
Look and feel v13
2020-12-03 14:34:15 +01:00
Laurent Destailleur
fd56f5fa21
Merge pull request #15621 from Hystepik/develop#1
...
Fix a bug in bank's graph with option and mode
2020-12-02 18:31:16 +01:00
Laurent Destailleur
9e18997e64
FIX #15595
2020-12-02 16:35:43 +01:00
lmarcouiller
8a86593b13
Fix a bug in bank's graph with option and mode
2020-12-02 16:24:01 +01:00
Scrutinizer Auto-Fixer
6df4954b20
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-12-01 01:41:19 +00:00
Christian Foellmann
f801dd7d66
PR toggle FCKeditor on public/private notes
2020-11-30 16:39:14 +01:00
Laurent Destailleur
958893228a
Fix combo to add contact and status of contact on popup
2020-11-30 15:18:58 +01:00
Laurent Destailleur
00ad6df395
Fight against $_POST
2020-11-30 14:47:07 +01:00
Laurent Destailleur
7634212811
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/phpinfo.php
htdocs/commande/stats/index.php
htdocs/compta/facture/stats/index.php
2020-11-29 21:35:03 +01:00
Laurent Destailleur
d3a2aa664f
FIX #15572
2020-11-29 20:27:40 +01:00
Laurent Destailleur
6c65ebef0d
Look and feel v13
2020-11-29 15:16:53 +01:00
Laurent Destailleur
85a6a296c8
Fix links
2020-11-28 19:13:17 +01:00
Laurent Destailleur
59b445a103
Clean dead code
2020-11-28 14:47:39 +01:00
Laurent Destailleur
574919de52
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
2020-11-27 15:45:12 +01:00
Laurent Destailleur
ac3c129735
Clean code
2020-11-27 14:24:15 +01:00
Laurent Destailleur
69b06a25e8
Fix code of deletion of objects
2020-11-26 09:16:16 +01:00
Laurent Destailleur
ac859bc38e
Merge pull request #15531 from FHenry/develop
...
Fix bank transfert supplier
2020-11-25 13:06:10 +01:00
Laurent Destailleur
0ad0035f19
Update list.php
2020-11-25 12:47:10 +01:00
Florian HENRY
73d6266151
continue fix banktransfert supplier
2020-11-25 11:22:31 +01:00
Florian HENRY
12ef03f06d
fix banck tranfert supplier
2020-11-25 10:58:34 +01:00
Florian HENRY
4a316f06d5
fix : finish bank transfert fourn from list
2020-11-25 10:24:44 +01:00
Laurent Destailleur
81566289cd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
2020-11-24 11:07:35 +01:00
Laurent Destailleur
890f7a0602
Merge pull request #15497 from atm-john/12.0_fix_thirdparty_propagate_extrafields_to
...
FIX Dol print error : conf usage thirdparty propagate extrafields to
2020-11-23 21:43:03 +01:00
ATM john
fbc911aea1
Fix conf usage thirdparty propagate extrafields to
2020-11-23 16:40:31 +01:00
Givriz
dca4cf5987
Feature : ajout de la class "button-cancel"
...
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
Laurent Destailleur
f2cd2570b9
Fix link
2020-11-22 12:03:44 +01:00
Laurent Destailleur
3d2da45f84
Remove warning
2020-11-22 11:36:07 +01:00
Givriz
c48129e279
Ajout de la class "button-save"
...
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
2020-11-19 20:23:38 +01:00
Florian HENRY
46326d7659
merge from develop
2020-11-19 13:53:34 +01:00
Laurent Destailleur
7195760ade
Restore lost param
2020-11-18 18:20:40 +01:00
Laurent Destailleur
1708874306
Merge branch 'develop' into develop
2020-11-18 18:16:29 +01:00
Laurent Destailleur
928330c44b
Fix link to reconciliation page
2020-11-16 12:42:59 +01:00
Laurent Destailleur
6c42535eb2
Maxi debug v13
2020-11-16 12:20:18 +01:00
Frédéric FRANCE
52b4e2fbc5
doxygen
2020-11-14 22:25:25 +01:00
Laurent Destailleur
3c5ef18b36
FIX #15390
2020-11-14 00:47:28 +01:00
lmarcouiller
304e4ac8e6
FIX : #15373 Reset invalid email script
2020-11-13 11:07:35 +01:00
lmarcouiller
a1f26f2b55
FIX :15373 Reset invalid email script
2020-11-13 11:03:49 +01:00
lmarcouiller
0e5b18a1e9
FIX : #14713 bank graph show all accounts
2020-11-13 10:05:28 +01:00
jcp
10ae18fe44
Update SQL migration
2020-11-12 19:42:20 +01:00
JC Prieto
615342aa77
Update account.class.php
...
Doc on ics_transfer var
2020-11-12 10:32:52 +01:00
Laurent Destailleur
90884d8085
Fix compatibility with date_delivery
2020-11-11 18:08:40 +01:00
jcp
7e3ef08b25
ICS update
2020-11-10 19:17:11 +01:00
Laurent Destailleur
6536208a14
Merge pull request #15322 from OPEN-DSI/new-list-include-array-extra-fields-with-langfile
...
NEW include tpl for loading lang file for extra fields in list
2020-11-10 14:42:21 +01:00
Laurent Destailleur
47b3b30aaa
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/fourn/product/list.php
htdocs/product/fournisseurs.php
htdocs/societe/card.php
2020-11-10 11:10:35 +01:00
jcp
eb0fd1674d
Update ICS
2020-11-09 18:40:57 +01:00
Florian Mortgat
bf27c56fa7
Following PR#15336: it should not be possible to modify the third party of an invoice
2020-11-09 17:09:06 +01:00
Scrutinizer Auto-Fixer
f6e3f58fcb
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-11-09 14:18:56 +00:00
jcp
50d530733e
NEW: ICS fields moved into bank account table
2020-11-09 14:08:34 +01:00
Laurent Destailleur
da6c6c9e0a
Clean code
2020-11-08 14:39:20 +01:00
Laurent Destailleur
e103503bb1
Fix warning php8
2020-11-08 12:34:45 +01:00
Laurent Destailleur
d04bbe09b7
Fix syntax error
2020-11-08 00:38:12 +01:00
Laurent Destailleur
a9fbe9dd6c
Fix remove warning
2020-11-08 00:18:41 +01:00
Laurent Destailleur
e2f5a302be
Fix warning
2020-11-07 23:04:23 +01:00
Laurent Destailleur
129c53342a
Fix warning
2020-11-07 20:01:28 +01:00
Laurent Destailleur
215ecafb32
Look adn feel v13
2020-11-07 15:54:58 +01:00
Laurent Destailleur
a46248ffe9
Merge pull request #15311 from frederic34/patch-6
...
doxygen
2020-11-06 18:45:34 +01:00
Laurent Destailleur
1649a8b5a6
Fix status
2020-11-06 16:41:54 +01:00
lvessiller
4ddff7173f
NEW include tpl for loading lang file for extra fields in list
2020-11-06 12:19:45 +01:00
Laurent Destailleur
ac6f8e4e7c
Debug v13
2020-11-06 11:52:48 +01:00
Laurent Destailleur
ed8a0093ff
Debug v13
2020-11-05 22:25:14 +01:00
Frédéric FRANCE
3f164f1a9b
doxygen
2020-11-05 20:13:13 +01:00
Laurent Destailleur
3295d37be2
Merge pull request #15284 from frederic34/patch-13
...
Update card.php
2020-11-04 20:31:46 +01:00
Laurent Destailleur
79a56571f1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-04 18:51:06 +01:00
Laurent Destailleur
1a2d094ce7
Removed dead code
2020-11-04 18:50:49 +01:00
Laurent Destailleur
d6b25bd891
Revert "remove deprecated"
2020-11-04 18:45:50 +01:00
Laurent Destailleur
ef5b14d20f
Merge pull request #15285 from frederic34/patch-14
...
remove deprecated
2020-11-04 18:41:32 +01:00
Laurent Destailleur
6392a36489
Merge pull request #15282 from frederic34/patch-10
...
doxygen
2020-11-04 18:36:03 +01:00
Frédéric FRANCE
ce2e8407d5
remove deprecated
2020-11-03 21:28:57 +01:00
Frédéric FRANCE
6c3ecc600d
Update card.php
2020-11-03 21:02:57 +01:00
Frédéric FRANCE
73d01612d4
doxygen
2020-11-03 20:50:51 +01:00
Frédéric FRANCE
d80f614e20
doxygen
2020-11-03 20:43:42 +01:00
Laurent Destailleur
508683b9f0
Clean duplicated code
2020-11-03 14:52:04 +01:00
Laurent Destailleur
b0e2d40533
Debug and fix v13
2020-11-03 14:19:54 +01:00
Laurent Destailleur
9e967a578e
FIX #14985 - I vertion option RELOAD_PAGE_ON_CUSTOMER_CHANGE
2020-11-03 02:17:51 +01:00
Laurent Destailleur
3df0d5dc22
FIX #15268
2020-11-02 20:05:06 +01:00
Laurent Destailleur
83a7b19333
Look and feel v13
2020-11-02 11:41:07 +01:00
Laurent Destailleur
e0ed89c514
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/compta/facture/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/product/class/product.class.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
2020-11-01 17:58:41 +01:00
Laurent Destailleur
72160deef7
FIX #14979
2020-11-01 17:01:26 +01:00
Laurent Destailleur
ad922bfde6
FIX #15074
2020-11-01 16:08:09 +01:00
Scrutinizer Auto-Fixer
ab25e047c0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer
7f52920716
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Frédéric FRANCE
8daf0c168c
Update facture.class.php
2020-10-31 13:27:29 +01:00
Frédéric FRANCE
8190711342
doxygen
2020-10-30 18:01:01 +01:00
Laurent Destailleur
a24071492e
Start fix for php8 compatibility
2020-10-30 05:56:07 +01:00
Laurent Destailleur
c187b41714
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-29 13:10:39 +01:00
Laurent Destailleur
ee4a827627
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/bank/various_payment/card.php
htdocs/compta/bank/various_payment/list.php
htdocs/core/db/DoliDB.class.php
2020-10-29 13:10:10 +01:00
Laurent Destailleur
2a386b6fea
Fix set subledger account
2020-10-29 11:13:18 +01:00
Laurent Destailleur
91cf5de54d
Fix bad sort order
2020-10-29 11:06:18 +01:00
Laurent Destailleur
b1b7a7c725
Fix missing transaction
2020-10-29 10:40:50 +01:00
Florian HENRY
4b7707cc7c
Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product
2020-10-28 17:17:52 +01:00
Florian HENRY
d77a0b40a8
tested and approuve feaure #15036
2020-10-28 16:37:41 +01:00
Florian HENRY
a3073be8e4
Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product
2020-10-28 08:52:29 +01:00
Frédéric FRANCE
7a7a6f8018
fix phpcs
2020-10-27 21:28:26 +01:00
Scrutinizer Auto-Fixer
a2a9c51e50
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-27 18:46:07 +00:00
Laurent Destailleur
1b939ab8f4
Merge pull request #15183 from frederic34/dol_fiche_end
...
end of dol_fiche_end
2020-10-27 19:00:32 +01:00
Laurent Destailleur
358ac4cd36
Fix scrutinizer
2020-10-27 18:55:55 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end
2020-10-27 18:19:31 +01:00
Laurent Destailleur
56903d3677
Fix trans
2020-10-27 10:35:22 +01:00
Laurent Destailleur
16ac8a9d52
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-27 10:33:46 +01:00
Laurent Destailleur
8bcd704d9b
Disable notif as it is used as a frame
2020-10-27 10:32:25 +01:00
Laurent Destailleur
5943e784ec
Remove var_dump
2020-10-27 10:27:44 +01:00
Laurent Destailleur
00b49dba18
Fix label
2020-10-27 10:26:30 +01:00
Laurent Destailleur
ffc961599c
FIX error 500 on cash fence
2020-10-27 10:19:00 +01:00
Laurent Destailleur
3f0a9cfce9
Fix var not defined
2020-10-27 02:03:13 +01:00
Florian HENRY
8c935661ee
Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product
2020-10-26 10:29:35 +01:00
Laurent Destailleur
2638d4596a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/actions_sendmails.inc.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/facture/card.php
2020-10-25 21:33:13 +01:00
Laurent Destailleur
6bc0630c5f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/boxes/box_services_contracts.php
2020-10-25 21:09:43 +01:00
Florian HENRY
7c2b5b614f
NEW: preload product description on selection for customer propal/order/invoice
2020-10-25 19:13:09 +01:00
Laurent Destailleur
6fa174d13f
Merge pull request #15051 from laudeco/feature/11878_select_bank_account
...
11878 - select the only bank account
2020-10-25 14:56:08 +01:00
Laurent Destailleur
4d9c8e2225
Merge pull request #15124 from frederic34/retrieve
...
retrieve the spelling
2020-10-25 14:48:51 +01:00
Laurent Destailleur
a7b23dc4f6
Update chargesociales.class.php
2020-10-25 14:14:50 +01:00
Maxime Kohlhaas
309691f1e7
Fix #15143 selected lines on invoice creation
2020-10-25 09:28:41 +01:00
Laurent De Coninck
1d62834b2c
use the second version for default bank account
2020-10-24 17:15:48 +02:00
Frédéric FRANCE
f4181a77cd
Update chargesociales.class.php
2020-10-24 13:53:00 +02:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉
2020-10-23 20:08:35 +02:00
Laurent Destailleur
8d5d7f801c
Merge branch 'develop' into patch-7
2020-10-23 14:10:33 +02:00
Laurent Destailleur
d21ad72e4a
Fix phpcs
2020-10-23 13:58:19 +02:00
Laurent Destailleur
ffcf8edd19
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-23 13:55:42 +02:00
Laurent Destailleur
edbf4dc375
Fix doc
2020-10-23 13:55:14 +02:00
Frédéric FRANCE
0f1996759f
fix phpcs
2020-10-23 08:12:19 +02:00
Laurent Destailleur
3bab0a322d
Merge pull request #15110 from frederic34/dol_fiche_head
...
replace deprecated
2020-10-23 04:03:46 +02:00
Laurent Destailleur
254da6923b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/line.php
2020-10-23 04:00:45 +02:00
Laurent Destailleur
0e25843baa
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2020-10-23 03:59:11 +02:00
Laurent Destailleur
c9a73cc380
Fix phpcs
2020-10-23 03:55:18 +02:00
Laurent Destailleur
62420c5e7b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/fourn/facture/card.php
2020-10-23 03:51:22 +02:00
Laurent Destailleur
d9aa83e699
Fix phpcs
2020-10-23 03:41:26 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated
2020-10-22 22:50:03 +02:00
Laurent Destailleur
a5e2ab2822
Merge pull request #15106 from frederic34/rejet
...
add type
2020-10-22 21:36:36 +02:00
Frédéric FRANCE
f4b42234ec
add space
2020-10-22 21:32:12 +02:00
Frédéric FRANCE
02403ba640
add type
2020-10-22 21:29:33 +02:00
Regis Houssin
cbb6e4effe
FIX sql syntax error
2020-10-22 19:32:32 +02:00
Laurent Destailleur
b4581b6af8
Better error management
2020-10-22 18:39:45 +02:00
Marc de Lima Lucio
594d9e321e
FIX: invoice payment terms edition: error management
2020-10-22 18:28:27 +02:00
Laurent Destailleur
fb7202b7f8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-22 17:55:47 +02:00
Laurent Destailleur
0616b9bc9b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/line.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/functions2.lib.php
htdocs/core/tpl/card_presend.tpl.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2020-10-22 17:55:38 +02:00
Philippe GRAND
fae572d43a
fix : deprecated
2020-10-22 16:29:17 +02:00
Laurent Destailleur
2702bd023f
Merge pull request #15059 from frederic34/patch-6
...
Add ref instead id in bank check remittance
2020-10-22 16:12:31 +02:00
Laurent Destailleur
648efbc0cb
Merge pull request #15067 from prietojc/12.0
...
FIX: Payment by BankTransfer
2020-10-22 15:59:19 +02:00
Laurent Destailleur
ca93f732c8
Update line.php
2020-10-22 15:59:04 +02:00
Laurent Destailleur
b9e6b188bc
Update rejetprelevement.class.php
2020-10-22 15:58:24 +02:00
Laurent Destailleur
10a8ce82a9
Update bonprelevement.class.php
2020-10-22 15:57:25 +02:00
Laurent Destailleur
272caceab9
Merge pull request #15071 from joseplluis/patch-8
...
Add customer country information in popup
2020-10-22 15:53:12 +02:00
Laurent Destailleur
1a70c016c5
Merge pull request #15093 from OPEN-DSI/new-invoice-list-margin-info-rights
...
Add rights on margin info on invoice list
2020-10-22 15:49:05 +02:00
Laurent Destailleur
b96a59b089
Merge pull request #15086 from ppenelon/develop
...
NEW Retrieve discount from invoice from API
2020-10-22 15:45:09 +02:00
lvessiller
b13ef34804
NEW add rights on margin info on invoice list
2020-10-22 14:56:53 +02:00
Pierre Penelon
1d218b3260
Linting api_invoices.class.php
2020-10-22 09:56:13 +02:00
Pierre Penelon
b8cb080f0d
ADD Retrieve discount from invoice from API
...
As I was unable to retrieve discount ID of created discount from invoice with API.
This commit add a route to get discount from a specific invoice ID.
2020-10-22 09:26:46 +02:00
Laurent Destailleur
351c8a5a2d
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2020-10-21 20:10:43 +02:00
Laurent Destailleur
409f8f9866
Update doc
2020-10-21 19:50:40 +02:00
lvessiller
9b423106dc
NEW add margin info in invoice list
2020-10-21 16:10:48 +02:00
John Botella
70790009a9
Fix display warranty fields on page load
2020-10-21 14:49:51 +02:00
stickler-ci
ff02bba5bf
Fixing style errors.
2020-10-20 15:18:29 +00:00
Josep Lluís
e51dd2919e
Add customer country information in popup
...
Add customer country information in popup of draft invoices.
In other boxes it's ok.
2020-10-20 17:15:03 +02:00
jcp
b09a618f38
Fix Bank Transfer
2020-10-20 13:19:47 +02:00
jcp
a2d242356a
Fix BankTransfer (V12.0.2)
2020-10-20 13:17:14 +02:00
Frédéric FRANCE
78bc3ecbfd
Add ref instead id in bank check remittance
2020-10-19 14:10:48 +02:00
Laurent De Coninck
d2e2cad028
select by default, remove the show empty everywhere the field is required
2020-10-17 21:15:52 +02:00
Laurent Destailleur
7504f92a41
Standardize code and look and feel
2020-10-16 13:30:20 +02:00
Laurent Destailleur
cd9acd02a1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-15 20:51:46 +02:00
Laurent Destailleur
9bbb471b4f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/stats/cabyprodserv.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/loan/card.php
2020-10-15 20:51:30 +02:00
Laurent Destailleur
2155c0123d
Merge pull request #15021 from Givriz/dev
...
Fix : correction de commentaires
2020-10-15 20:15:12 +02:00
Laurent Destailleur
520645a02c
Renamed all methods valide() into validate()
2020-10-15 10:15:37 +02:00
Laurent Destailleur
d283e8f649
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/stats/cabyprodserv.php
2020-10-14 20:15:19 +02:00
Laurent Destailleur
1691fcedfb
Fix phpcs
2020-10-14 20:13:30 +02:00
Givriz
c50e288a07
Correction de commentaires
...
Correction de commentaires (passage de français à anglais ou correction d'un mauvais anglais).
2020-10-14 18:26:05 +02:00
Laurent Destailleur
a2a6ddaa66
Merge pull request #15008 from TobiasSekan/SelectableColumnsOnSalesTaxesList
...
NEW Selectable columns on sales tax list
2020-10-14 17:37:23 +02:00
Laurent Destailleur
7838ca32ba
Fix sql injection reported by Jason Nordenstam
2020-10-14 01:52:53 +02:00
Laurent Destailleur
c539c6d00d
Responsive
2020-10-13 17:36:45 +02:00
stickler-ci
dcd8a88e72
Fixing style errors.
2020-10-13 13:28:23 +00:00
Sekan, Tobias
f28e1dc4fb
cleanup
2020-10-13 15:27:42 +02:00
Sekan, Tobias
dfff32f239
Selectable columns on sales tax list
2020-10-13 15:09:25 +02:00
Laurent Destailleur
d3b6ada4eb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/stats/cabyprodserv.php
2020-10-13 15:08:53 +02:00
Laurent Destailleur
496d429dcd
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-10-13 15:04:25 +02:00
Laurent Destailleur
32fe8a37b4
Merge pull request #14992 from TobiasSekan/SelectableColumnsOnSocialTaxesList
...
NEW Select-able columns on social taxes list
2020-10-13 11:11:06 +02:00
Laurent Destailleur
fcd4645509
Standardize code: Property product_libelle renamed into product_label
...
Move common vars declaration into parent class.
2020-10-12 19:33:00 +02:00
stickler-ci
675b1e613b
Fixing style errors.
2020-10-12 12:05:38 +00:00
Sekan, Tobias
3b905bdcd5
Selectable columns on social taxes list
2020-10-12 14:00:33 +02:00
atm-lena
bf7d5b56fb
FIX subcat filter
2020-10-12 11:50:19 +02:00
Alexandre SPANGARO
ae64e513a8
FIX #14956 Add a possibility to modify date on credit note invoice
2020-10-10 07:19:13 +02:00
Laurent Destailleur
a23a91a4b9
Merge pull request #14971 from TobiasSekan/GlobalPaymentSearch
...
NEW: Add global search for customer payments and vendor payments
2020-10-09 13:56:52 +02:00
Laurent Destailleur
e24ec99c8f
Fix regression
2020-10-09 11:51:34 +02:00
Laurent Destailleur
4eaf2c0350
Fix regression
2020-10-09 11:49:45 +02:00
Laurent Destailleur
b6fc33c454
Fix avoid error when we sumbit form to change page on conciliation
2020-10-09 11:13:02 +02:00
Laurent Destailleur
5ac7d4dbac
Show last 12 bank receipts instead of 15
2020-10-09 10:02:13 +02:00
stickler-ci
6b3f20dc65
Fixing style errors.
2020-10-09 07:29:25 +00:00
Sekan, Tobias
35fbc602ee
Add global payment search
2020-10-09 09:22:26 +02:00
Laurent Destailleur
3cd953bc41
Fix colspan
2020-10-08 11:40:05 +02:00
atm-lena
74ae9a2618
FIX CA report by product/service : subcategory filter
2020-10-08 10:49:46 +02:00
Laurent Destailleur
eb41a72e27
Properties ->titre have been renamed into ->title
2020-10-07 17:41:36 +02:00
Laurent Destailleur
213cefb570
Merge pull request #14941 from aspangaro/13a22
...
WIP NEW Add clone functionality on miscellaneous payment
2020-10-07 15:31:09 +02:00
Scrutinizer Auto-Fixer
1512521d91
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-07 13:01:28 +00:00
Laurent Destailleur
4c87949be0
Fix scrutinizer
2020-10-07 14:53:10 +02:00
Alexandre SPANGARO
973502bb1e
Fix
2020-10-07 09:36:29 +02:00
Laurent Destailleur
31f4d99e19
css
2020-10-07 00:53:01 +02:00
Laurent Destailleur
e9bcd95c39
Add information column on page to export source of accounting document
2020-10-07 00:49:19 +02:00
Laurent Destailleur
663f149982
Better error management
2020-10-06 16:48:48 +02:00
Laurent Destailleur
a744abce94
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-06 16:30:12 +02:00
Laurent Destailleur
e247b2de61
FIX list of fields in list of recurring invoices was empty
2020-10-06 16:29:29 +02:00
Laurent Destailleur
4ea102f1de
css
2020-10-06 15:18:32 +02:00
Laurent Destailleur
95f67309e2
Clean code
2020-10-06 15:11:45 +02:00
Alexandre SPANGARO
503f190fd4
Fix
2020-10-06 14:39:10 +02:00
Laurent Destailleur
e3542c6d4f
Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights
...
NEW Show category filter on lists only when user have rights to read categories
2020-10-06 12:29:10 +02:00
Laurent Destailleur
ef2e531d34
Merge pull request #14928 from TobiasSekan/SelectableColumnsOnCustomerInvoicePaymentList
...
NEW Select-able columns on customer invoice paymnet list
2020-10-06 12:28:20 +02:00
Laurent Destailleur
38acd83f4d
Review some titles and tooltip help to be more clear.
2020-10-06 12:17:33 +02:00
Alexandre SPANGARO
050a4770d3
WIP NEW Add clone functionality on miscellaneous payment
2020-10-06 10:04:15 +02:00
Laurent Destailleur
9ada5c7427
Merge pull request #14938 from ppenelon/ppenelon-patch-1
...
FIX Require Discount class on markAsCreditAvailable API method
2020-10-06 09:55:28 +02:00
Laurent Destailleur
054c58df16
Add currency into the select
2020-10-06 09:53:29 +02:00
stickler-ci
8f542a8572
Fixing style errors.
2020-10-06 06:56:08 +00:00
Sekan, Tobias
33b7d06bb9
address feedback + tooltip + reduce indent
2020-10-06 08:46:53 +02:00
stickler-ci
b9cc780c3c
Fixing style errors.
2020-10-05 21:58:00 +00:00
Pierre Penelon
609a29219d
FIX|Missing require in API : markAsCreditAvailable
...
Quick fix of a problem I encountered earlier when using `markAsCreditAvailable` API method for invoice routes.
The method was using the `DiscountAbsolute` class without importing it resulting in a 500 HTTP error.
2020-10-05 23:54:37 +02:00
Laurent Destailleur
ee40aeecce
Standardize API
2020-10-05 12:21:54 +02:00
Sekan, Tobias
8447817f8c
fix swapped array entries
2020-10-05 11:38:07 +02:00
Sekan, Tobias
3984d8c2b8
Add selectable columns on cust. invoice pay. list
2020-10-05 11:27:44 +02:00
Laurent Destailleur
07e1646b3a
Minor fixes
2020-10-04 19:09:25 +02:00
Laurent Destailleur
2ca28c37b6
Merge pull request #14790 from c3do/patch-14
...
FIX API paymentsdistributed accept multicurrency part payment
2020-10-04 11:28:33 +02:00
Laurent Destailleur
7b3a7c9921
Add token on all url with action=delete
2020-10-01 10:50:54 +02:00
Laurent Destailleur
f442dac2c9
Add token on most GET url for admin action
2020-09-30 15:13:28 +02:00
Laurent Destailleur
a3da2afe7a
Add option MAIN_LIST_ALLOW_PUBLIC_NOTES + MAIN_LIST_ALLOW_PRIVATE_NOTES
2020-09-30 11:58:40 +02:00
Laurent Destailleur
fba8fdae6e
Merge pull request #14856 from bafbes/abb120146
...
new:bankline_prepare_head for bank lines
2020-09-29 16:40:51 +02:00
Laurent Destailleur
babcc3bc91
Update line.php
2020-09-29 16:39:47 +02:00
Laurent Destailleur
8b2ba8cbba
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/bom/bom_card.php
htdocs/core/class/ldap.class.php
htdocs/core/lib/files.lib.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/admin.lang
2020-09-29 13:28:22 +02:00
bahfir abbes
9662c4110a
new:bankline_prepare_head for bank lines
2020-09-29 01:28:39 +01:00
Laurent Destailleur
9973ffab01
Fix sanitizing
2020-09-28 13:05:12 +02:00
Sekan, Tobias
2bf15b3a92
Show category filter only on rights to read it
2020-09-28 10:42:49 +02:00
Laurent Destailleur
f851ce2f0f
Merge pull request #14741 from Tim-Otte/fix-zero-price-lines
...
FIX: Allow product price equal zero in new lines
2020-09-27 20:46:36 +02:00
Laurent Destailleur
0d797a793a
On technical error, return http code 500
2020-09-25 15:01:15 +02:00
root
fcbc48fa28
Bug fix last_gen should be date_last_gen
2020-09-25 14:24:26 +02:00
Laurent Destailleur
3c6dda9dd5
Clean code
2020-09-25 10:27:30 +02:00
Laurent Destailleur
d6ce6bb47f
Standardize code
2020-09-25 10:05:59 +02:00
Laurent Destailleur
2404856409
Fix sql inj
2020-09-24 15:38:27 +02:00
Laurent Destailleur
6f919f1dd0
Merge branch 'develop' into PreselectThirpartyOnNewFromList
2020-09-23 20:02:48 +02:00
Laurent Destailleur
bb10379768
NEW Can change a product in line of recurring invoice or contract
2020-09-23 18:45:19 +02:00
stickler-ci
e037f2e5c7
Fixing style errors.
2020-09-23 07:11:59 +00:00
Tobias Sekan
a72519f353
Merge branch 'develop' into PreselectThirpartyOnNewFromList
2020-09-23 09:09:42 +02:00
Sekan, Tobias
638c586a05
Merge branch 'PreselectThirpartyOnNewFromList' of https://github.com/TobiasSekan/dolibarr into PreselectThirpartyOnNewFromList
2020-09-23 08:59:45 +02:00
Sekan, Tobias
ce6758657a
Fix visiblity when came from Extended POS + doc
2020-09-23 08:59:30 +02:00
stickler-ci
06d41c029d
Fixing style errors.
2020-09-22 14:41:28 +00:00
Cédric
2dc148eae0
$accepthigherpayment (tested and work)
...
Accept higher payments that it remains to be paid
2020-09-22 16:38:59 +02:00
Regis Houssin
fcfe5423f4
FIX missing field entity
2020-09-22 16:34:38 +02:00
Laurent Destailleur
6c06d2f0aa
Look and feel v13
2020-09-22 15:26:29 +02:00
Tim Otte
e373de91d9
Fixed a bug where a price equal zero would be replaced with the product price
2020-09-22 14:43:09 +02:00
Laurent Destailleur
e52559783f
Look and feel v13
2020-09-21 13:54:26 +02:00
Laurent Destailleur
b4b0d682b8
css
2020-09-20 20:35:22 +02:00
Laurent Destailleur
40d894a610
Merge pull request #14768 from atm-gauthier/develop_new_hooks_in_stats_pages
...
NEW : add hooks on stats pages
2020-09-20 17:17:44 +02:00
Laurent Destailleur
e5cca13ea0
Fix escaping
2020-09-20 03:32:43 +02:00
Laurent Destailleur
216b3c885d
Fix escaping
2020-09-20 01:30:36 +02:00
Cédric
a0313fdc52
Update api_invoices.class.php
2020-09-19 22:39:39 +02:00
stickler-ci
3deed42671
Fixing style errors.
2020-09-19 20:05:08 +00:00
Cédric
7306a949e3
Update api_invoices.class.php
2020-09-19 22:02:52 +02:00
Cédric
90d2dfcca7
FIX deleteContact
2020-09-19 22:01:48 +02:00
Laurent Destailleur
7dd69a2b2b
Fix escape
2020-09-19 20:11:04 +02:00
Cédric
fbc8fe1e0c
Update api_invoices.class.php
2020-09-19 15:14:29 +02:00
Cédric
a0efd47cce
Update api_invoices.class.php
2020-09-19 15:12:57 +02:00
Cédric
9f22882417
Update api_invoices.class.php
2020-09-19 15:05:28 +02:00
stickler-ci
e1751d4bfb
Fixing style errors.
2020-09-19 12:23:53 +00:00
Cédric
720a113125
Update api_invoices.class.php
2020-09-19 14:16:17 +02:00
Laurent Destailleur
b6c6473cce
Fix sql injection when forging requests with IN
2020-09-18 17:47:40 +02:00
Laurent Destailleur
4e2aff2cdc
Fix sql injection when forging requests with IN
2020-09-18 17:28:02 +02:00
Laurent Destailleur
2d38644ae1
Sanitize sortfield
2020-09-18 17:13:01 +02:00
Tobias Sekan
b2a953ed5b
Merge branch 'develop' into PreselectThirpartyOnNewFromList
2020-09-18 12:21:41 +02:00
Sekan, Tobias
eac9e54e0b
fix more different button visibility
2020-09-18 11:48:53 +02:00
Sekan, Tobias
ae8c302c19
merge variable declaration
2020-09-18 10:52:17 +02:00
Sekan, Tobias
dc4250aed7
Make button visiblity identical on most lists
2020-09-18 10:46:23 +02:00
Sekan, Tobias
1b04ef8aad
Add function to all list that support $socid
2020-09-18 10:36:40 +02:00
Sekan, Tobias
d1f70a37df
Preselect thirparty on new from list (part 1)
2020-09-18 07:56:13 +02:00
Laurent Destailleur
801712b423
Fix phpcs
2020-09-18 01:41:42 +02:00
Laurent Destailleur
c4b5f5a249
Maxi clean of code
2020-09-18 01:29:17 +02:00
Got2be
03f37f3c1f
NEW : add hooks on stats pages
2020-09-17 17:00:58 +02:00
Laurent Destailleur
9a758b7edd
FIX #yogosha4483
2020-09-17 14:31:25 +02:00
Laurent Destailleur
bfbb217607
Fix GETPOST on 'action'
2020-09-16 19:39:50 +02:00
Laurent Destailleur
afc6155783
FIX sign of amount with credit note and multicurrencies
2020-09-15 13:30:59 +02:00
Laurent Destailleur
cc24e9b155
Look and feel v13
2020-09-15 13:27:48 +02:00
Laurent Destailleur
7a28972c8a
FIX sign of amount of invoice lines for credit note with multicurrency
...
FIX Add INVOICE_POSITIVE_CREDIT_NOTE_SCREEN to solve PT requirement
2020-09-15 11:18:21 +02:00
Laurent Destailleur
cc37f4b29c
Clean code. <input name="token" value="$_SESSION['newtoken']" is now
...
forbidden by CI. You must use newToken().
2020-09-14 16:24:02 +02:00
Florian Mortgat
06d31e8b9a
FIX: missing entity check
2020-09-14 16:09:45 +02:00
Laurent Destailleur
604a807ac0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-14 12:48:00 +02:00
Laurent Destailleur
6117e0d8d7
Fix tooltip into tooltip
2020-09-14 12:47:43 +02:00
Scrutinizer Auto-Fixer
73915d51c8
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-14 02:30:04 +00:00
Laurent Destailleur
22edd650d3
Fix phpcs
2020-09-14 04:24:35 +02:00
Laurent Destailleur
970995d728
Clean code. Replace num_paiement with num_payment everywhere.
2020-09-14 01:03:51 +02:00
Laurent Destailleur
a2df666d34
Standardize code
2020-09-14 00:41:31 +02:00
Laurent Destailleur
62b7a90ea3
Merge pull request #14723 from c3do/patch-13
...
NEW API Can update a payment
2020-09-14 00:29:10 +02:00
Laurent Destailleur
e9d0869383
Update api_invoices.class.php
2020-09-14 00:28:43 +02:00
Laurent Destailleur
dcdce246b1
Update api_invoices.class.php
2020-09-14 00:26:16 +02:00
stickler-ci
8d3bc3ee6f
Fixing style errors.
2020-09-13 13:18:42 +00:00
Cédric
929804f4d2
Update api_invoices.class.php
2020-09-13 15:12:22 +02:00
stickler-ci
2cfe740d85
Fixing style errors.
2020-09-12 17:08:44 +00:00
Cédric
d728d268ca
Update paiement.class.php
2020-09-12 18:49:52 +02:00
Laurent Destailleur
1f8278c8ca
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/core/class/html.formmail.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/langs/en_US/other.lang
htdocs/product/class/product.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-09-12 04:42:59 +02:00
Laurent Destailleur
5ea3f09e17
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/translate.class.php
2020-09-12 04:29:28 +02:00
Laurent Destailleur
990af9d5cf
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formmail.class.php
2020-09-12 04:25:54 +02:00
Laurent Destailleur
5c776ccf3f
Merge pull request #14708 from TobiasSekan/AddGlobalMiscPaymentSearch
...
NEW Add global search for miscellaneous payments
2020-09-12 01:13:26 +02:00
Laurent Destailleur
c4383747a1
Look and feel v13
2020-09-11 13:57:16 +02:00
Laurent Destailleur
64b28020c8
Look and feel v13
2020-09-11 13:14:14 +02:00
Sekan, Tobias
25d6af2b86
Add global search for misc payments +TODO
2020-09-11 09:55:34 +02:00
Laurent Destailleur
358f8357f9
FIX #14703
2020-09-10 18:25:38 +02:00
Laurent Destailleur
0cccaa7271
FIX look and feel v12
2020-09-10 18:02:49 +02:00
Laurent Destailleur
ed6a16a3c7
FIX look and feel v12
2020-09-10 17:17:31 +02:00
Laurent Destailleur
b8fe2188a6
Standardize code around model_pdf
2020-09-10 01:49:09 +02:00
Laurent Destailleur
97ee96e0dc
Merge pull request #14683 from TobiasSekan/SelectableColumnsOnExtraPayments
...
NEW Select-able columns on miscellaneous payments + more data columns
2020-09-09 14:54:04 +02:00
Cédric
1d894f4b7c
FIX ref_ext for invoice lines from API
...
Add and update ref_ext in invoice lines
2020-09-09 13:38:42 +02:00
Sekan, Tobias
849a5ed865
Merge branch 'SelectableColumnsOnExtraPayments' of https://github.com/TobiasSekan/dolibarr into SelectableColumnsOnExtraPayments
2020-09-09 13:27:47 +02:00
Sekan, Tobias
8fa001d98d
Fix to short summary line
2020-09-09 13:27:41 +02:00
Laurent Destailleur
d236e21639
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
2020-09-09 12:51:55 +02:00
Laurent Destailleur
05912b3b55
Fix sql error
2020-09-09 12:50:07 +02:00
stickler-ci
32d77cc143
Fixing style errors.
2020-09-09 09:46:46 +00:00
Sekan, Tobias
870443a099
Add selectable columns for extra payments
2020-09-09 11:34:47 +02:00
Scrutinizer Auto-Fixer
c263c8a76c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-08 19:27:28 +00:00
Scrutinizer Auto-Fixer
b78ff67d7e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-07 08:18:17 +00:00
Laurent Destailleur
02e07c13c8
Merge branch 'develop' into patch-8
2020-09-04 23:11:00 +02:00
Laurent Destailleur
c8da9f97a8
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2020-09-04 19:51:22 +02:00
stickler-ci
1cff5e0e03
Fixing style errors.
2020-09-04 17:33:58 +00:00
Cédric
5f4ad2a9fa
NEW ref_ext for Facture lines
2020-09-04 19:32:42 +02:00
Cédric
b60f82966c
Update facture.class.php
2020-09-04 17:54:25 +02:00
Laurent Destailleur
2e609d448c
Fix error message
2020-09-04 16:30:34 +02:00
Juanjo Menent
9bd5ed627f
Fix travis issues
2020-09-04 09:55:02 +02:00
Laurent Destailleur
661e3c7a11
Merge pull request #14576 from TobiasSekan/ShowBankOnlyWhenActive
...
FIX: Show bank account only when bank module is active (on invoices)
2020-09-03 13:19:32 +02:00
Juanjo Menent
bb92e64e43
FIX : #14474 Error when deleting
2020-09-03 12:43:38 +02:00
Laurent Destailleur
03d0ccc1cc
Merge pull request #14621 from TobiasSekan/ShowNumAndClickOnPaymentArea
...
NEW Show header number and make it clickable on payment area
2020-09-03 12:20:38 +02:00
Laurent Destailleur
1a33cd91c9
Update index.php
2020-09-03 12:20:20 +02:00
stickler-ci
06e8e62d38
Fixing style errors.
2020-09-03 09:49:35 +00:00
Sekan, Tobias
8f37f66470
Show number and allow click on payment area
2020-09-03 11:36:11 +02:00
Laurent Destailleur
0d4f7cb485
Fix responsive and title of reports
2020-08-30 17:42:49 +02:00
Laurent Destailleur
5eca65f673
css
2020-08-29 02:35:24 +02:00
Laurent Destailleur
ad87e753b4
Clean trim on GETPOST (already included inside GETPOST when not 'none'
2020-08-28 21:27:50 +02:00
Sekan, Tobias
9c54f8831f
Show bank only when active (on new)
2020-08-28 13:08:04 +02:00
Sekan, Tobias
216e22e505
Show bank only when bank module is active
2020-08-28 12:53:30 +02:00
Laurent Destailleur
30838f01d4
Fix warning
2020-08-27 22:03:52 +02:00
Laurent Destailleur
d40f90fecb
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-08-27 22:00:38 +02:00
Laurent Destailleur
ad63434f3e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/prelevement/index.php
2020-08-27 22:00:10 +02:00
Laurent Destailleur
3b4508b44f
Update paiement.class.php
2020-08-27 19:59:46 +02:00
Florian Mortgat
9b3f13458f
FIX: missing entity check
2020-08-26 16:02:31 +02:00
andreubisquerra
a5ab711b27
Change variable to pos_change
2020-08-23 22:22:05 +02:00
andreubisquerra
e36eb42568
Fix travis
2020-08-22 18:46:39 +02:00
jove@bisquerra.com
d9cbd8f998
NEW: Print payment method and change in TakePOS
2020-08-22 18:28:15 +02:00
Laurent Destailleur
7217dc3114
Better perf for phpunit on very large databases
2020-08-19 01:43:48 +02:00
Laurent Destailleur
964c4ef0d2
Standardize code. Use model_pdf.
2020-08-18 14:48:38 +02:00
Laurent Destailleur
2ca0d67072
Removed section of files to download into POS
2020-08-18 11:20:02 +02:00
Laurent Destailleur
0381cf5665
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/modules/modPaymentByBankTransfer.class.php
htdocs/filefunc.inc.php
2020-08-14 11:08:53 +02:00
Juanjo Menent
3eb23d3325
FIX: MySql Strict mode
2020-08-11 10:12:19 +02:00
Juanjo Menent
4e6b7289f2
FIX: MySql Strict mode
2020-08-11 10:07:38 +02:00
Juanjo Menent
b1735b0f80
FIX: MySql Strict mode
2020-08-11 10:02:46 +02:00
Laurent Destailleur
e69616110d
Fix permission on page
2020-08-07 16:59:27 +02:00
Laurent Destailleur
9d79e984dd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/tpl/stockcorrection.tpl.php
2020-08-06 02:15:04 +02:00
Laurent Destailleur
8b4e153f81
Doc
2020-08-05 20:05:59 +02:00
Laurent Destailleur
24a9a5ac2d
CSS
2020-08-05 19:42:36 +02:00
Laurent Destailleur
76624122dd
Fix regression: Restore filter on "alerte"
2020-08-05 16:05:29 +02:00
Laurent Destailleur
0ada919f65
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
2020-08-04 21:22:56 +02:00
Laurent Destailleur
eefa2bcaba
FIX List of invoice waiting for direct debit
2020-08-04 21:12:28 +02:00
Laurent Destailleur
9d4e672475
FIX Debug direct debit module and credit transfer module
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/create.php
2020-08-04 21:12:03 +02:00
Laurent Destailleur
a3f7cbd63d
css
2020-08-04 21:07:56 +02:00
Laurent Destailleur
84bdfc4bb7
FIX List of invoice waiting for direct debit
2020-08-04 21:06:38 +02:00
Laurent Destailleur
5189e8beea
FIX Debug direct debit module and credit transfer module
2020-08-04 20:26:57 +02:00
Laurent Destailleur
d8da007e0e
css
2020-08-04 18:50:57 +02:00
Laurent Destailleur
4c1aa25b32
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/admin/adherent_emails.php
htdocs/core/tpl/extrafields_list_search_title.tpl.php
htdocs/product/traduction.php
2020-08-04 13:51:11 +02:00
Laurent Destailleur
2076d18825
FIX Param of fetch_name_optionals_label must be object->table_element
2020-08-04 12:47:09 +02:00
Tim Otte
0e03578e91
Fixed translation of product units in documents
2020-08-04 11:51:40 +02:00
Laurent Destailleur
e455f8afa6
Merge pull request #14369 from Tim-Otte/fix-product-unit-translation
...
Fixed translation of product units in documents
2020-08-04 11:50:50 +02:00
Tim Otte
360afccecc
Fixed translation of product units in documents
2020-08-04 11:02:16 +02:00
Laurent Destailleur
063b63d348
Fix phpcs
2020-08-04 00:36:45 +02:00
Laurent Destailleur
da76775fbd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/factures.php
htdocs/compta/prelevement/fiche-rejet.php
2020-08-03 21:18:45 +02:00
Laurent Destailleur
f62717a16a
FIX Debug module direct debit order. Solve conflict with credit transfer
2020-08-03 20:16:33 +02:00
Laurent Destailleur
fb811a1656
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/database-tables.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/commonobject.class.php
htdocs/langs/fr_FR/withdrawals.lang
htdocs/societe/class/societe.class.php
2020-08-03 14:44:01 +02:00
Laurent Destailleur
8c34acbf55
FIX Warning if no bank account defined
2020-08-03 14:11:15 +02:00
Laurent Destailleur
e64b8eaf40
Fix debug credit transfer module
2020-08-03 11:21:13 +02:00
Laurent Destailleur
be34a2c607
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/cashdesk.lang
htdocs/product/stock/list.php
2020-08-02 16:06:51 +02:00
Laurent Destailleur
3bfd7644a4
Fix return link
2020-08-01 20:17:49 +02:00
Laurent Destailleur
364fb05ed3
Fix phpcs
2020-07-28 09:46:31 +02:00
Laurent Destailleur
91a50038ff
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/fiche-stat.php
2020-07-27 19:35:34 +02:00
Laurent Destailleur
8c06e3577d
Fix several trouble with diret debit module and credit transfer module
2020-07-27 19:33:24 +02:00
Laurent Destailleur
52f238a351
Fix label
2020-07-25 14:50:09 +02:00
Laurent Destailleur
2d45fd04fe
Doc
2020-07-25 14:47:43 +02:00
Laurent Destailleur
e3126ec999
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/tpl/card_presend.tpl.php
htdocs/multicurrency/class/multicurrency.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-07-25 00:22:47 +02:00
Laurent Destailleur
1bd00ac775
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-07-25 00:17:36 +02:00
Laurent Destailleur
960416f9bf
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/comm/card.php
2020-07-25 00:17:28 +02:00
John Botella
fc1de5b4f3
Fix multicurecy option not applied
2020-07-23 11:10:18 +02:00
VERDOL Gauthier
55298317e3
FIX : wrong link to third invoice templates
2020-07-20 16:22:48 +02:00
Laurent Destailleur
0d24b979c1
Fix phpcs
2020-07-11 01:20:20 +02:00
Laurent Destailleur
a059154fdf
FIX reposition
2020-07-10 13:59:54 +02:00
Laurent Destailleur
f92f279527
FIX Navigation from bank receipts
2020-07-10 13:56:54 +02:00
Laurent Destailleur
db6ed7a646
FIX Navigation from bank receipts
2020-07-10 13:40:33 +02:00
Laurent Destailleur
bd63b84f8e
Fix label of social contribution and button date
2020-07-09 23:18:19 +02:00
Laurent Destailleur
5ea47f3ade
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/resultat/index.php
htdocs/product/admin/product.php
htdocs/projet/tasks/list.php
2020-07-08 18:11:58 +02:00
Laurent Destailleur
4fd970af28
Fix phpcs
2020-07-07 01:29:31 +02:00
Laurent Destailleur
14c98f277b
NEW Can change VAT rate of all lines of a draft object in one step.
2020-07-06 22:48:22 +02:00
Laurent Destailleur
091fbb2824
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-07-06 11:55:06 +02:00
Laurent Destailleur
9b1163cfb8
Fix menu organisation.
2020-07-06 11:52:28 +02:00
Laurent Destailleur
1e9ae1bc02
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/resultat/index.php
htdocs/fourn/class/fournisseur.commande.class.php
2020-07-06 11:32:04 +02:00
Laurent Destailleur
2629a98851
Fix regression
2020-07-06 11:31:05 +02:00
Laurent Destailleur
053a1a2230
Fix duplicate code
2020-07-06 11:22:30 +02:00
Laurent Destailleur
9cd8c3738f
Fix trans
2020-07-05 23:18:19 +02:00
Laurent Destailleur
54a77a604c
FIX Missing token
2020-07-05 12:55:08 +02:00
Laurent Destailleur
d18ce3b39e
Look and feel v12
...
Conflicts:
htdocs/langs/en_US/cashdesk.lang
2020-07-05 12:54:42 +02:00
Laurent Destailleur
c9e5536fbc
FIX Missing token
2020-07-05 12:46:53 +02:00
Laurent Destailleur
176f678a85
Look and feel v12
2020-07-05 12:46:15 +02:00
Laurent Destailleur
93a3efac3a
Fix phpcs
2020-07-04 19:26:51 +02:00
Laurent Destailleur
83eaddb17b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/evalmath.class.php
htdocs/core/class/extrafields.class.php
htdocs/install/mysql/migration/11.0.0-12.0.0.sql
htdocs/langs/en_US/cashdesk.lang
htdocs/societe/class/societe.class.php
2020-07-04 13:13:17 +02:00
Laurent Destailleur
e256ce5c4b
Debug credit transfer module
2020-07-03 19:27:23 +02:00
Laurent Destailleur
b88e159495
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/card.php
2020-07-03 00:46:18 +02:00
Laurent Destailleur
59049cd047
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-07-03 00:41:32 +02:00
Laurent Destailleur
53c5ec51b8
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-07-03 00:40:59 +02:00
Laurent Destailleur
18fa4c4105
Update card.php
2020-07-03 00:38:31 +02:00
Laurent Destailleur
16b327f106
Debug module credit transfer
2020-07-02 15:45:11 +02:00
Laurent Destailleur
ae0c738980
FIX Entry from stripe intent were reported into SEPA payments
...
FIX Label of popup on thirdparty
FIX Missing the tooltip when creating bank account
2020-07-01 19:42:28 +02:00
Laurent Destailleur
e2a9743dd4
Debug module credit transfer
2020-07-01 14:19:47 +02:00
gauthier
6553c40bea
FIX : create a deposit with amount using comma didn't work
2020-06-30 11:23:55 +02:00
Laurent Destailleur
ab88890f3a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-28 21:48:28 +02:00
Laurent Destailleur
cf899364f3
Merge pull request #14116 from aspangaro/12p1
...
FIX: SQL Problem in customer invoice list
2020-06-28 21:13:17 +02:00
Laurent Destailleur
a11f7d1070
Update list.php
2020-06-28 21:11:25 +02:00
Laurent Destailleur
90d4458aab
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2020-06-27 00:38:51 +02:00
Alexandre SPANGARO
0c60c9fd0d
FIX: SQL Problem in social contribution list
2020-06-25 20:53:03 +02:00
Laurent Destailleur
e4922f38ab
Add missing extrafield and trigger in template invoice creation
2020-06-25 14:01:38 +02:00
Laurent Destailleur
333d4873c3
Properties ->contactid has been renamed into ->contact_id
2020-06-25 12:17:47 +02:00
Laurent Destailleur
02e022ebfa
Fix class not found for supplier credit. Class must be into
...
commoninvoice
2020-06-24 19:59:06 +02:00
Alexandre SPANGARO
ffaf7068d5
FIX: SQL Problem in customer invoice list
2020-06-24 14:03:16 +02:00
Laurent Destailleur
6d25b8630b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/prelevement.php
htdocs/core/class/rssparser.class.php
2020-06-23 11:38:20 +02:00
Laurent Destailleur
566c1aaf84
Fix for credit transfer module
2020-06-22 22:54:33 +02:00
Laurent Destailleur
c54294285a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
2020-06-20 12:28:14 +02:00
Laurent Destailleur
b54c18730b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
2020-06-20 12:25:08 +02:00
Laurent Destailleur
378db9ab9a
Merge pull request #14099 from atm-florian/12.0
...
fix: same feature on thirdparty extrafields transport to invoice as existing on orders
2020-06-20 12:16:57 +02:00
Laurent Destailleur
5a53a16c17
Merge pull request #14101 from mistraloz/patch-5
...
Fix: Bug when delete payment when already deleted in account
2020-06-20 12:15:59 +02:00
Laurent Destailleur
da9c25348e
Update paiement.class.php
2020-06-20 12:15:48 +02:00
Laurent Destailleur
8eb23c5ee5
Merge pull request #14103 from atm-florian/12_fix_invoicelist_filterbySalesRep
...
fix f.fk_user_author unknow because after stange join with coma
2020-06-20 12:14:48 +02:00
Laurent Destailleur
f24e73141e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-19 14:53:31 +02:00
Laurent Destailleur
15af3d68fc
FIX #13877
2020-06-19 14:50:33 +02:00
florian HENRY
07923e0baf
fix f.fk_user_author unknow because after stange join with coma
2020-06-19 10:08:19 +02:00
Mistral Oz - LWEP
2f7bb18e2b
Fix: Bug when delete payment when already deleted in account
...
Related to :
https://github.com/Dolibarr/dolibarr/blame/11.0/htdocs/compta/bank/class/account.class.php#L1976
Mistake between id / rowid. I prefere add the fix here (but a fix in account class can be also a good fix).
And best fix may use setter to do it (but to complicated : maybe latter ? i may check it in september if you want in all CommonObject properties)
2020-06-18 20:56:46 +02:00
florian HENRY
a705cc41ae
fix: same feature on invoice as on orders
2020-06-18 19:44:24 +02:00
florian HENRY
835f6d42d8
Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12.0
2020-06-18 19:42:34 +02:00
florian HENRY
e82d71c949
fix: same feature on invoice as on orders
2020-06-18 19:42:23 +02:00
Laurent Destailleur
a607ff4c1a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/core/lib/project.lib.php
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/products.lang
htdocs/langs/fr_FR/stocks.lang
htdocs/langs/fr_FR/ticket.lang
htdocs/mrp/mo_card.php
2020-06-18 15:50:31 +02:00
Laurent Destailleur
fded55ddef
Fix sepa supplier count
2020-06-18 03:44:26 +02:00
Laurent Destailleur
c36c8ed447
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_linkedfiles.inc.php
2020-06-17 15:28:19 +02:00
Laurent Destailleur
1a7f0741b5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
htdocs/core/actions_linkedfiles.inc.php
htdocs/fourn/class/paiementfourn.class.php
2020-06-17 14:53:24 +02:00
Florian Mortgat
3d69a1dc70
FIX 11.0 - multicurrency amount not fetched when fetching payments from llx_paiement or llx_paiementfourn
2020-06-17 11:06:31 +02:00
Laurent Destailleur
4627f06c70
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-16 22:57:50 +02:00
Laurent Destailleur
b7d835eceb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-15 16:10:27 +02:00
Laurent Destailleur
40e16672e3
FIX BlindBoolean SQL injection reported by Christian Weiler
...
<sak1.s3curity@gmail.com>
2020-06-15 15:08:52 +02:00
Laurent Destailleur
15dd1bd705
Merge
2020-06-14 21:50:40 +02:00
Laurent Destailleur
964f17c507
Fix escape fields
2020-06-14 21:49:25 +02:00
Laurent Destailleur
f9da31e658
Fix rounding
2020-06-14 21:49:19 +02:00
Laurent Destailleur
83263cc174
Fix supplier sepa
2020-06-14 21:49:12 +02:00
Laurent Destailleur
2d5c35b12a
Fix debug sepa module
2020-06-14 21:46:32 +02:00
Laurent Destailleur
abb8cd260f
Fix escape fields
2020-06-14 21:22:44 +02:00
Laurent Destailleur
c22a9781d8
Fix rounding
2020-06-14 21:21:18 +02:00
Laurent Destailleur
f0ca29cc6e
Fix supplier sepa
2020-06-14 21:19:31 +02:00
Laurent Destailleur
a48f263af2
Fix phpcs
2020-06-11 13:58:12 +02:00
Laurent Destailleur
5bc9e656bf
Fix phpcs
2020-06-11 13:03:21 +02:00
Laurent Destailleur
ff9312c96a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/class/ligneprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/line.php
2020-06-08 20:36:54 +02:00
Laurent Destailleur
70bdd59548
Fix trans
2020-06-08 11:52:43 +02:00
Laurent Destailleur
c386f4b2e3
Maxi debug of direct debit order
2020-06-08 11:43:20 +02:00
Laurent Destailleur
6f12488e30
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
2020-06-07 19:55:48 +02:00
Laurent Destailleur
d1dba53f61
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/admin/modules.php
htdocs/install/mysql/migration/repair.sql
2020-06-07 19:40:17 +02:00
Laurent Destailleur
941362e683
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture.class.php
2020-06-07 18:59:49 +02:00
Laurent Destailleur
4020d97362
FIX Can create a credit note on situation invoice if previous is also
...
credit note
2020-06-07 18:36:58 +02:00
Laurent Destailleur
180a0a4557
Info for debug
2020-06-07 18:30:46 +02:00
Vaadasch
7b53ee2a6f
Update byratecountry.php
...
Add "cc.code" in the "GROUP BY" clause. Error in PGSQL if absent.
Add ORDER BY country / product_type / vatrate
2020-06-07 14:13:57 +02:00
Laurent Destailleur
7d3039d41f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/user/card.php
2020-06-06 23:04:55 +02:00
Laurent Destailleur
19405d5f5b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/langs/en_US/admin.lang
2020-06-06 23:02:05 +02:00
Laurent Destailleur
cbafbe16a2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/supplier/index.php
htdocs/admin/mails_templates.php
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formticket.class.php
htdocs/langs/en_US/admin.lang
2020-06-06 23:00:24 +02:00
Laurent Destailleur
5669eb81af
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-06 15:39:50 +02:00
Laurent Destailleur
919cc0da87
Fix num payment
2020-06-06 15:39:18 +02:00
Florian Mortgat
c393f8149c
FIX: when creating a VariousPayment, the value date is not copied onto the AccountLine that gets created at the same time, so the bank transaction's value date will be the payment date instead of the payment's value date
2020-06-04 11:29:51 +02:00
Laurent Destailleur
8dbc0ff040
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/prelevement.php
htdocs/admin/system/phpinfo.php
htdocs/modulebuilder/index.php
2020-05-31 00:31:14 +02:00
Laurent Destailleur
6123596ec9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/fichinter/list.php
2020-05-31 00:28:40 +02:00
Laurent Destailleur
2b317120d3
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/facture/card.php
2020-05-31 00:25:33 +02:00
Laurent Destailleur
e8016a5e7e
Fix credit-transfer vs direct debit
2020-05-30 23:46:14 +02:00
kamel
1e208e537f
FIX: Fix link of the button to create a credit note and fix the awareness of a error happen when to create a credit note
2020-05-29 16:24:07 +02:00
kamel
a4800f7b9b
FIX: Fix link of the button to create a credit note and fix the awareness of a error happen when to create a credit note
2020-05-29 16:18:27 +02:00
Laurent Destailleur
791d147992
Merge branch 'NewCustomerInvoiceArea' of
...
https://github.com/TobiasSekan/dolibarr into develop
# Conflicts:
# htdocs/langs/en_US/bills.lang
2020-05-28 18:29:59 +02:00
Laurent Destailleur
537b291fab
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/prelevement/bons.php
2020-05-28 12:24:55 +02:00
Laurent Destailleur
f66555b396
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-27 23:38:46 +02:00
Laurent Destailleur
6881610892
Doxygen
2020-05-27 23:23:01 +02:00
Laurent Destailleur
a2a15ceb5b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/demandes.php
htdocs/core/class/html.form.class.php
2020-05-27 23:07:18 +02:00
Laurent Destailleur
15f2165c12
Fix work on payment by bank transfer (avoid confusion between record)
2020-05-27 20:14:11 +02:00
Florian Mortgat
954c29786e
FIX 10.0 - pagination in prelevement/bons.php
2020-05-27 12:15:42 +02:00
Laurent Destailleur
40816c02ce
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-25 22:40:59 +02:00
Laurent Destailleur
c67eeeaf6c
CSS
2020-05-25 11:30:52 +02:00
Laurent Destailleur
61545703d1
CSS
2020-05-25 10:58:18 +02:00
Laurent Destailleur
47465f4108
Fix for situation invoice (exclude credit not when searching last
...
invoice to use)
2020-05-25 00:20:00 +02:00
Frédéric FRANCE
e5402988d9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-24 17:58:18 +02:00
Laurent Destailleur
6056ed2755
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/index.php
2020-05-24 01:02:08 +02:00
Frédéric FRANCE
5c78eca68a
prepare new rule
2020-05-23 21:14:44 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule
2020-05-23 21:07:47 +02:00
Laurent Destailleur
7bfbf3c88b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/index.php
2020-05-23 20:20:53 +02:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-23 18:34:58 +02:00
Laurent Destailleur
aec5200a98
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/variants/class/ProductCombination.class.php
2020-05-23 15:37:00 +02:00
Tobias Sekan
58e32aa2ff
Fix not wokring default values for date (re...)
2020-05-23 14:22:30 +02:00
Laurent Destailleur
7463eb2bd0
Merge pull request #13938 from TobiasSekan/FixDefaultDateValuesForInvoice
...
FIX not working default date values for new invoices
2020-05-23 14:21:50 +02:00
Laurent Destailleur
b4fa56d07e
Merge pull request #13947 from TobiasSekan/FixDefaultValuesForPaymentOnInvoices
...
FIX not working default values for payment on new invoices
2020-05-23 13:33:01 +02:00
stickler-ci
2873f4dacf
Fixing style errors.
2020-05-22 06:08:12 +00:00
Tobias Sekan
53080be245
fix not working default values for payment
2020-05-22 08:01:29 +02:00
Frédéric FRANCE
b41ac00b98
add new rule
2020-05-21 15:05:19 +02:00
Tobias Sekan
2efe3d7da0
Fix not wokring default values for date (re...)
2020-05-21 09:31:06 +02:00
Frédéric FRANCE
f5688b2eec
add new rule
2020-05-21 01:52:25 +02:00
Laurent Destailleur
346082b153
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-19 19:59:24 +02:00
gauthier
f3582d891a
FIX : We must only rename current bank receipt
2020-05-19 15:35:37 +02:00
Laurent Destailleur
3e187f8ce0
Fix add check on size limit
2020-05-19 03:36:29 +02:00
Laurent Destailleur
88c40633d5
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-18 15:57:29 +02:00
Laurent Destailleur
ff8d22a80d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/expedition/class/expedition.class.php
scripts/cron/cron_run_jobs.php
2020-05-18 15:57:01 +02:00
Laurent Destailleur
9336828710
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/paiement/card.php
htdocs/expedition/class/expedition.class.php
2020-05-18 15:54:39 +02:00
ptibogxiv
a9d1519f96
FIX php error if multicompany disabled
2020-05-18 14:52:33 +02:00
Laurent Destailleur
bd564486ff
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-17 20:03:09 +02:00
Laurent Destailleur
106fe7bde6
Clean conflict between direct debit and direct credit orders.
2020-05-17 15:06:09 +02:00
Laurent Destailleur
af46108cc4
Look and feel v12
2020-05-17 13:34:16 +02:00
Laurent Destailleur
5933aba38c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-15 14:12:04 +02:00
Laurent Destailleur
0f403ba9ea
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-15 14:11:13 +02:00
Scrutinizer Auto-Fixer
9699ee7263
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-15 11:55:31 +00:00
Laurent Destailleur
91f87d6834
Fix bad param of getNomUrl
2020-05-15 13:52:35 +02:00
Laurent Destailleur
a865dc7232
Merge pull request #13762 from indelog/rappaygroupmod
...
NEW possibilty to group payments by mode and show their subtotal
2020-05-14 16:55:37 +02:00
Laurent Destailleur
ab07330668
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-05-14 16:34:45 +02:00
Laurent Destailleur
92b245ae93
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/facture/card.php
2020-05-14 16:34:24 +02:00
DEMAREST Maxime (Indelog)
ac0b735131
Fix use date_ech for social contributions in accounting-file.php
2020-05-13 18:01:00 +02:00
DEMAREST Maxime (Indelog)
ee6e717f46
Add payment loan in accounting-files.php
2020-05-13 17:47:30 +02:00
DEMAREST Maxime (Indelog)
872518a91f
Add total by credit/debit for accounting-file.php
2020-05-13 16:54:53 +02:00
DEMAREST Maxime (Indelog)
5f400d27b4
Add preview file in compta/accounting-files.php
2020-05-13 15:01:32 +02:00
DEMAREST Maxime (Indelog)
fcb3b112d9
Fix use datep field for various payment in accouting-files.php
2020-05-13 09:31:14 +02:00
stickler-ci
b7ae5ffa1d
Fixing style errors.
2020-05-13 06:12:45 +00:00
DEMAREST Maxime (Indelog)
0850570e95
Fix and imporve some points for compta/accounting-flles.php
...
* Fix zip generation for accouning-files if line has no document.
The zip file generated if $filesarray contain a line with empty 'files'
was unsustainable because it try to add empty files.
* Add clickable link to jump on card for other line than Invoice and
Supplier Invoice
* Add various payment
* Use label as ref for paiements of salaries line to display more explicit line
2020-05-13 08:00:06 +02:00
Laurent Destailleur
b5f3be4599
Clean phpcs rule file
2020-05-13 00:29:46 +02:00
gauthier
fc2f2c6da7
FIX : wrong url param
2020-05-12 17:41:21 +02:00
Laurent Destailleur
e4611f2950
Fix filter on categories
2020-05-12 03:36:33 +02:00
Laurent Destailleur
ed68b73ef5
Merge pull request #13821 from atm-quentin/NEW_invoice_stat_graph_and_categ_search
...
NEW Add invoice stat graph and categ search
2020-05-12 03:31:09 +02:00
Laurent Destailleur
4584fa1aa6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/asset/list.php
htdocs/compta/bank/list.php
htdocs/contrat/services_list.php
htdocs/core/lib/date.lib.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/holiday/list.php
htdocs/projet/tasks/list.php
htdocs/supplier_proposal/list.php
htdocs/user/list.php
2020-05-11 19:43:06 +02:00
Maxime Kohlhaas
1a9afe6b20
Fix missing hook params for printFieldListValue
2020-05-08 01:40:25 +02:00
Laurent Destailleur
f23451e1c9
Update facture.class.php
2020-05-07 23:04:52 +02:00
stickler-ci
7514a625fd
Fixing style errors.
2020-05-07 20:11:59 +00:00
Vaadasch
db8596743c
Update facture.class.php
...
Auto-update dates (if not empty) of services when cloning facture.
Actual code is only for month by month.
If empty (start or end) => do nothing
If set, update for next month if there is only 1d between what had been set and the start (or end) of the month.
If there is more than one day from start or end of the month => do nothing, because we're not sure the service is by month
Worst case scenario : the facture is cloned, the service is updated with new unwanted dates
User need to manually updates date : he would have done that either way
2020-05-07 22:09:55 +02:00
Laurent Destailleur
03fddd48af
Clean some constructors
2020-05-07 12:14:45 +02:00
Laurent Destailleur
6c8d302dd9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/list.php
htdocs/compta/prelevement/rejets.php
htdocs/fourn/commande/index.php
2020-05-07 12:03:49 +02:00
Laurent Destailleur
d6887f3ca4
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/prelevement/bons.php
htdocs/compta/prelevement/list.php
htdocs/core/class/notify.class.php
2020-05-07 11:59:13 +02:00
DEMAREST Maxime (Indelog)
7bf037ab2f
Fix blank line at end of control structure
2020-05-06 13:46:24 +02:00
DEMAREST Maxime (Indelog)
bf8cd51a5a
Fix somes code formating errors
2020-05-06 13:37:24 +02:00
DEMAREST Maxime (Indelog)
128ec6fd78
Add include various payments and loans in accounting report
...
For simplified accouning, behaviour not enable by default and must be
enabed in simplified accounting module admin page (or by global
settings ACCOUNTING_REPORTS_INCLUDE_VARPAY and
ACCOUNTING_REPORTS_INCLUDE_LOAN).
2020-05-06 12:58:41 +02:00
Tobias Sekan
3de77cff3f
fix lint errors
2020-05-06 12:11:54 +02:00
Tobias Sekan
d0efa79efa
Add customer invoice area
2020-05-06 11:34:31 +02:00
atm-quentin
b6aa766c72
FIX stickler
2020-05-06 09:37:17 +02:00
atm-quentin
eab69c3a59
NEW multiselect categorie client stats facturation
2020-05-05 16:15:33 +02:00
atm-quentin
1b35380dda
NEW stats invoice graph with 3 bars
2020-05-05 16:13:04 +02:00
Laurent Destailleur
797beef79f
Fix
2020-05-05 15:26:41 +02:00
Laurent Destailleur
b7fe2b31cd
Merge pull request #13813 from oscim/patch-38
...
Update list.php
2020-05-05 15:22:29 +02:00
kamel
db591cdcd8
FIX: show value of the extrafields in the bank list
2020-05-05 14:47:31 +02:00
gauthier
c14b6884e3
FIX : missing hook init + table class + $page not set
2020-05-05 10:03:19 +02:00
oscim
c7753dd2e0
Update list.php
2020-05-05 09:44:46 +02:00
stickler-ci
204c788dec
Fixing style errors.
2020-05-05 06:56:54 +00:00
oscim
d6de46cc05
Update list.php
...
Add massaction for payment invoice
2020-05-05 08:54:52 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-02 01:39:56 +00:00
Laurent Destailleur
8208e81622
Merge pull request #13767 from indelog/statsbytype
...
Add possibility to filter stats by ThirdParty type and categorie
2020-05-01 22:05:06 +02:00
Laurent Destailleur
c27b3c5966
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
2020-04-30 18:49:20 +02:00
Laurent Destailleur
4c27ae6530
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/facture/card.php
2020-04-30 18:47:18 +02:00
Laurent Destailleur
b1495e12ce
FIX A variable was erased by a temporary variable
2020-04-30 18:45:00 +02:00
DEMAREST Maxime (Indelog)
790cffb7ae
Correct select label for categories in stats pages
2020-04-29 15:24:13 +02:00
DEMAREST Maxime (Indelog)
398b0234ea
Correct label for select thirdparty categorie in invoice stats
2020-04-29 14:10:06 +02:00
DEMAREST Maxime (Indelog)
1bd9372022
Forgot comments to document news params for the modified methods
2020-04-29 10:00:29 +02:00
DEMAREST Maxime (Indelog)
40f1bed8d0
Add possibility to filter stats by ThirdParty type and categorie
2020-04-29 09:17:44 +02:00
Laurent Destailleur
f8dfe886ac
Fix css
2020-04-28 20:52:24 +02:00
DEMAREST Maxime (Indelog)
740b2c9228
NEW possibilty to group payments by mode and show their subtotal
...
This add two params (PAYMENTS_REPORT_GROUP_BY_MOD and
PAYMENTS_FOURN_REPORT_GROUP_BY_MOD) for payments and supplier payments
to group them by mode and get subtotals for each mode. Add the
corresponding configuration options on admin page fore each payments and
supplier payments.
2020-04-28 09:01:00 +02:00
Laurent Destailleur
fb8bdefbaa
Look and feel v12
2020-04-28 02:10:26 +02:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23
2020-04-27 14:14:13 +02:00
Laurent Destailleur
31ba277da7
Fix phpcs
2020-04-26 23:18:09 +02:00
Laurent Destailleur
b20d85b198
Fix phpcs
2020-04-26 23:06:52 +02:00
Laurent Destailleur
6caa872280
Enable more PHPCS rules
2020-04-25 19:27:42 +02:00
Laurent Destailleur
3090eb578b
Look and feel v12
2020-04-25 17:43:12 +02:00
Laurent Destailleur
1121d2c1c6
Look and feel v12
2020-04-25 13:49:44 +02:00
Laurent Destailleur
731864eb4a
Removed useless translation keys
2020-04-25 12:43:41 +02:00
Laurent Destailleur
6b114a31ce
Look and feel v12
2020-04-25 03:00:41 +02:00
Laurent Destailleur
291664d109
Look and feel v12
2020-04-25 01:04:26 +02:00
Laurent Destailleur
54d641020f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/accounting-files.php
2020-04-24 22:49:59 +02:00
Laurent Destailleur
4564a5cffd
Update accounting-files.php
2020-04-24 19:01:08 +02:00
Laurent Destailleur
7bbfd2175d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.dispatch.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/reception/class/reception.class.php
2020-04-24 18:58:47 +02:00
florian HENRY
a685026756
fix: remove php warning
2020-04-24 17:22:35 +02:00
Laurent Destailleur
b77892451f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-04-24 16:21:58 +02:00
Laurent Destailleur
21665cdc85
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2020-04-24 16:21:51 +02:00
Laurent Destailleur
df91780552
FIX Situation invoice take into account the credit notes.
2020-04-24 15:57:08 +02:00
Laurent Destailleur
b2b580f6fb
Report error
2020-04-24 15:21:38 +02:00
Laurent Destailleur
42ee9845ad
Report error
2020-04-24 15:21:02 +02:00
Scrutinizer Auto-Fixer
548f3007cf
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-23 16:55:10 +00:00
Laurent Destailleur
86be024dcc
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modFournisseur.class.php
2020-04-23 17:17:42 +02:00
stickler-ci
2633e90890
Fixing style errors.
2020-04-23 15:03:14 +00:00
simicar29
ce94788dd9
Clean line extrafields when deleting recurring invoice
...
Delete extrafields recurring invoice lines when deleting parent object
Delete extrafields when deleting a recurring invoice line
2020-04-23 17:01:40 +02:00
stickler-ci
aebc04d30a
Fixing style errors.
2020-04-23 14:33:11 +00:00
simicar29
b68e85703f
Clean line extrafields when deleting invoice
...
Delete extrafields invoice lines when deleting parent object (sql syntax ok for mariadb & pgsql)
Delete extrafields when deleting an invoice line
2020-04-23 16:29:22 +02:00
Laurent Destailleur
3a9add0e70
FIX #13663
2020-04-23 13:37:43 +02:00
Laurent Destailleur
72c6ac1c72
Complete #13708 , normalization of code
2020-04-23 13:21:39 +02:00
Frédéric FRANCE
4605b9ec61
Update api_bankaccounts.class.php
2020-04-22 19:16:58 +02:00
Laurent Destailleur
1ef89eb1a1
Fix $mysoc global not loaded.
2020-04-21 14:14:49 +02:00
Laurent Destailleur
cadb52c5b3
Look and feel v12
2020-04-20 19:39:34 +02:00
Laurent Destailleur
67a7d6b77d
Look and feel v12
2020-04-20 15:57:15 +02:00
Laurent Destailleur
16e46c672c
Clean code
2020-04-20 15:06:27 +02:00
Laurent Destailleur
98f370034a
Look and feel v12
2020-04-20 14:53:17 +02:00
Laurent Destailleur
40b3db940c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-20 14:44:36 +02:00
Laurent Destailleur
b90217d860
Merge pull request #13655 from frederic34/patch-4
...
fix indent
2020-04-20 14:38:17 +02:00
Laurent Destailleur
78474af486
Link missing
2020-04-20 03:14:44 +02:00
Frédéric FRANCE
5992318af7
Update card.php
2020-04-19 21:49:37 +02:00
Frédéric FRANCE
61e76ef25e
Update api_bankaccounts.class.php
2020-04-19 21:47:30 +02:00
Laurent Destailleur
018cfdf54b
FIX Field balance before and after sometimes not visible in bank entries
2020-04-18 16:14:37 +02:00
Laurent Destailleur
de74c447cc
Fix sanitize amount
2020-04-18 16:05:26 +02:00
Laurent Destailleur
2f2e3d5057
Merge pull request #13145 from atm-john/12.0_new_extend_retained_warranty
...
NEW : Extend retained warranty to be available for all invoices
2020-04-18 15:32:33 +02:00
Laurent Destailleur
b0515c626b
Look and feel v12
2020-04-18 00:09:24 +02:00
Laurent Destailleur
ee26390f89
Look and feel v12
2020-04-17 19:15:22 +02:00
Laurent Destailleur
6fd34f592d
Fix default value
2020-04-17 19:07:30 +02:00
Laurent Destailleur
ea60d0be63
FIX #13618
2020-04-17 10:27:38 +02:00
ATM john
c334a931de
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-04-16 20:29:54 +02:00
Laurent Destailleur
5254a94038
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ldap.php
htdocs/commande/class/commande.class.php
htdocs/commande/index.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/expedition/list.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/list.php
htdocs/loan/list.php
htdocs/product/class/product.class.php
htdocs/supplier_proposal/list.php
2020-04-16 15:58:59 +02:00
ptibogxiv
284f269213
Update api_bankaccounts.class.php
2020-04-15 19:32:45 +02:00
atm-quentin
f7c07640dd
viewstatut to search_status
2020-04-15 15:01:00 +02:00
ATM john
e6669348e1
Fix dom manipulation on creation
2020-04-15 11:09:34 +02:00
ATM john
4b4f69c76a
fix indentation
2020-04-15 10:52:28 +02:00
stickler-ci
e6b29aa0f0
Fixing style errors.
2020-04-15 08:48:45 +00:00
ATM john
a9c9292137
Merge branch '12.0_new_extend_retained_warranty' of github.com:atm-john/dolibarr into 12.0_new_extend_retained_warranty
2020-04-15 10:45:53 +02:00
ATM john
9a1993f71c
Fix retained warranty default value
2020-04-15 10:44:07 +02:00
stickler-ci
cbf6afb4a0
Fixing style errors.
2020-04-14 12:13:38 +00:00
ATM john
b70cd84402
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-04-14 14:11:12 +02:00
Laurent Destailleur
a72b262f5b
FIx #13592
...
Conflicts:
htdocs/compta/bank/line.php
2020-04-13 14:52:06 +02:00
Laurent Destailleur
4ab3bf99ec
FIx #13592
2020-04-13 14:50:55 +02:00
Laurent Destailleur
b54e3fb18c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-13 14:39:10 +02:00
Laurent Destailleur
f726fcdcd8
FIX #13593
2020-04-13 14:32:15 +02:00
Scrutinizer Auto-Fixer
387ea73bf3
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-13 11:24:42 +00:00
Laurent Destailleur
596ba8d679
Clean deprecated code.
2020-04-13 01:10:35 +02:00
Laurent Destailleur
b6baba7651
Removed deprecated var
2020-04-12 18:59:22 +02:00
Laurent Destailleur
92b6b1a042
Look and feel v12
2020-04-12 18:13:43 +02:00
Laurent Destailleur
4a6ffd2619
Merge pull request #13570 from frederic34/patch-6
...
Add table_ref_field to facture-rec class
2020-04-12 17:17:43 +02:00
Laurent Destailleur
422e33a68b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ihm.php
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/stats/cabyprodserv.php
htdocs/filefunc.inc.php
htdocs/takepos/invoice.php
2020-04-12 17:01:44 +02:00
Laurent Destailleur
1cda760621
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
2020-04-12 16:54:09 +02:00
Laurent Destailleur
2e27355dec
FIX #13569
2020-04-12 16:51:35 +02:00
Frédéric FRANCE
251f6d0cb1
Update facture-rec.class.php
2020-04-11 22:53:45 +02:00
Frédéric FRANCE
e9aa27d731
Update facture-rec.class.php
2020-04-11 21:06:33 +02:00
Laurent Destailleur
760121a3d1
Can sort list of answers.
2020-04-11 14:13:16 +02:00
gauthier
1f471d46eb
FIX : some others modules (like subtotal) use other product_type than 0 or 1 AND must not be considered in this report
2020-04-10 15:51:51 +02:00
Laurent Destailleur
0845f0bcd3
Merge pull request #13523 from bb2a/patch-2
...
add in default search
2020-04-10 12:12:28 +02:00
Scrutinizer Auto-Fixer
444c293c01
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Anthony Berton
96f1c961b7
Update list.php
2020-04-10 10:55:14 +02:00
Laurent Destailleur
4ff503d20a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/list.php
htdocs/supplier_proposal/list.php
2020-04-10 02:07:51 +02:00
Laurent Destailleur
7fe8c7eab3
FIX #11855
2020-04-10 01:37:04 +02:00
Laurent Destailleur
6a60678186
Look and feel v12
2020-04-09 16:36:39 +02:00
Laurent Destailleur
3a024124e8
Merge pull request #13525 from TobiasSekan/ConfirmDeleteOnFactureCard
...
NEW Confirm file delete on fracture card
2020-04-08 14:53:19 +02:00
Laurent Destailleur
efd6d14c1a
Merge pull request #13505 from atm-florian/develop
...
fix php warning
2020-04-08 14:40:59 +02:00
Laurent Destailleur
215c7b0e32
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/en_US/compta.lang
2020-04-08 11:42:43 +02:00
Laurent Destailleur
146ead4d04
Code comment
2020-04-08 11:39:22 +02:00
Laurent Destailleur
df81065f73
MAIN_VIEW_LINE_NUMBER_IN_LIST
2020-04-08 11:23:31 +02:00
stickler-ci
0ce44251f7
Fixing style errors.
2020-04-08 08:50:16 +00:00
Tobias Sekan
23645b7865
Add confirm for delte file in facture
2020-04-08 10:30:51 +02:00
Laurent Destailleur
8e7ad726b2
NEW Easier way to setup the different types of tax. Better visibility.
...
FIX edit of tax stamp regenerated the PDF.
2020-04-07 14:06:08 +02:00
Laurent Destailleur
ff1b3db54b
Fix regression on hamburger picto
2020-04-06 23:38:30 +02:00
florian HENRY
48da8c315f
fix php warning
2020-04-06 12:21:20 +02:00
Laurent Destailleur
03b09f1d28
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-05 12:14:03 +02:00
Laurent Destailleur
13b47774e2
FIX #13424
2020-04-05 11:55:43 +02:00
Maxime Kohlhaas
fd5b2ba391
New supplier turnover by product service report
2020-04-04 23:29:45 +02:00
Maxime Kohlhaas
60bd0e49ec
Fix missing token
2020-04-04 18:57:51 +02:00
Maxime Kohlhaas
fe876b96fe
Fix links + getEntity
2020-04-04 18:49:30 +02:00
Maxime Kohlhaas
1adfe5c21f
New supplier turnover by product service report
2020-04-04 15:45:32 +02:00
Maxime Kohlhaas
863f8dd1d6
New supplier turnover by thirdparty report
2020-04-04 15:38:22 +02:00
Maxime Kohlhaas
67f9b218c5
New supplier turnover report
2020-04-04 15:38:01 +02:00
Laurent Destailleur
99ddd25ad5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-04-02 16:51:50 +02:00
Laurent Destailleur
b8c2dd6025
Look and feel v12
2020-04-02 15:11:46 +02:00
Laurent Destailleur
ec0fe28da8
Merge pull request #13452 from andreubisquerra/master
...
NEW: Cash Control in TakePOS
2020-04-02 12:51:36 +02:00
Laurent Destailleur
bb9a4324d1
Merge pull request #13471 from atm-florianm/NEW_add_author_column_on_invoice_list_and_supplier_invoice_list
...
NEW: "author" column in the client/supplier invoice lists
2020-04-02 12:40:51 +02:00
Laurent Destailleur
5d9d62f185
Merge pull request #13480 from atm-florian/develop
...
fix: correct hook init invoice_rec list
2020-04-02 12:38:32 +02:00
Laurent Destailleur
84cda962c1
Clean dead code
2020-04-02 12:03:29 +02:00
florian HENRY
609de965b1
fix: hook init invoicerec list normalyse
2020-04-02 10:45:14 +02:00
stickler-ci
9476fbc3e7
Fixing style errors.
2020-04-01 23:16:13 +00:00
Alex Veremme
7330c31204
Fix ##13474: copy extrafields of LINES from a draft invoice to an
...
invoice template
2020-04-02 01:10:56 +02:00
Laurent Destailleur
70706d9ea7
FIX Missing token and take into account max date when it can.
2020-04-01 18:48:45 +02:00
Florian Mortgat
f52af23396
NEW: "author" column in the client/supplier invoice lists
2020-04-01 17:09:01 +02:00
ATM john
81adc6913e
change conf usage
2020-04-01 12:12:30 +02:00
ATM john
79fe664365
fix merge not applied
2020-03-31 16:43:38 +02:00
stickler-ci
004d9381f5
Fixing style errors.
2020-03-31 14:36:42 +00:00
ATM john
c466beea3d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-03-31 16:28:43 +02:00
jove@bisquerra.com
d9614ac6fc
Integrate Cash Control in TakePOS
2020-03-30 20:05:45 +02:00
Laurent Destailleur
04a5929e91
Merge pull request #13431 from aspangaro/12.0_a25
...
Typo
2020-03-30 18:52:10 +02:00
Laurent Destailleur
c27592bad2
Clean deprecated params on all fetch_optionals()
2020-03-27 16:02:58 +01:00
Alexandre SPANGARO
e1611a8366
Typo
2020-03-27 06:16:24 +01:00
Laurent Destailleur
3ae3e9a16e
Remove $_POST
2020-03-26 02:21:50 +01:00
Laurent Destailleur
d3debccabe
FIX bad value in currency into discount created from down payment
2020-03-26 02:14:57 +01:00
Laurent Destailleur
d2163c95d6
Save the vat src code when converting down payment into discount
2020-03-26 02:13:34 +01:00
Laurent Destailleur
88d98acbba
FIX #13410
...
Conflicts:
htdocs/compta/facture/card.php
2020-03-26 01:26:50 +01:00
Laurent Destailleur
ba000dbcfd
FIX #13410
2020-03-26 01:24:27 +01:00
Laurent Destailleur
2e5bfb207f
Fix responsive
2020-03-25 23:50:05 +01:00
Alexandre SPANGARO
c3e5cf901d
Work on split module fournisseur
2020-03-24 22:20:25 +01:00
Laurent Destailleur
a5379c7144
FIX All forms must use newToken()
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/cashcontrol/cashcontrol_card.php
htdocs/supplier_proposal/card.php
2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9
FIX All forms must use newToken()
2020-03-24 13:10:35 +01:00
Laurent Destailleur
f4a52470e3
Graph use color of status
2020-03-23 19:46:43 +01:00
Scrutinizer Auto-Fixer
e8083e2a65
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-23 14:54:02 +00:00
Laurent Destailleur
d662bb97dc
Debug parallel sale feature
2020-03-23 15:02:15 +01:00
Laurent Destailleur
222556b464
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/accounting-files.php
htdocs/core/lib/functions.lib.php
2020-03-19 22:09:17 +01:00
Laurent Destailleur
87e808fec4
Fix phpcs
2020-03-19 22:07:20 +01:00
Laurent Destailleur
a413e2861e
Fix edit html
2020-03-19 21:13:15 +01:00
Laurent Destailleur
d9f616d6e3
Avoid file xxx_preview-1.png into export
2020-03-19 15:59:49 +01:00
Laurent Destailleur
303961b0a6
Fix trans
2020-03-19 12:10:22 +01:00
Laurent Destailleur
8e1ffa5144
Fix management of token
2020-03-19 10:52:07 +01:00
Laurent Destailleur
c94c33696a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-19 09:58:04 +01:00
Laurent Destailleur
ea13c707a2
Merge pull request #13380 from atm-john/11.0_fix_import_lines_from_object_for_situation_invoices
...
FIX import lines from object for situation invoices
2020-03-18 19:25:04 +01:00
Laurent Destailleur
8bab245c7e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/tpl/contacts.tpl.php
2020-03-18 18:50:55 +01:00
Laurent Destailleur
c1931a045e
Merge pull request #13376 from fmarcet/11.0
...
FIX: Bank movements color is not showing
2020-03-18 18:22:46 +01:00
ATM john
c767e553d3
fix import line from object default value for situations
2020-03-18 10:59:13 +01:00
ATM john
7b8cafb710
remove var_dump
2020-03-18 10:34:44 +01:00
ATM john
d3aeec0a7c
Fix situation value transmission
2020-03-18 10:30:15 +01:00
Ferran Marcet
1fe4e4415e
FIX: Bank movements color is not showing
2020-03-18 09:27:08 +01:00
ATM john
075757eb3d
Fix situation value transmission
2020-03-17 16:49:05 +01:00
Laurent Destailleur
9525289488
Fix return code of some API
2020-03-17 13:50:20 +01:00
ATM john
cb43928a5d
Fix radio label target
2020-03-17 12:29:14 +01:00
Laurent Destailleur
73f2e9e5de
WIP migrate num_paiement into num_payment
...
Fix label for free product in takepos
2020-03-16 19:23:18 +01:00
Laurent Destailleur
621c4ff4e7
Fix phpcs
2020-03-15 19:52:46 +01:00
Laurent Destailleur
22e8fdb46b
Enhance #13033
2020-03-15 13:57:31 +01:00
stickler-ci
1a97e7283f
Fixing style errors.
2020-03-15 12:09:52 +01:00
andreubisquerra
d7150fb592
Change cash control procedure
2020-03-15 12:09:52 +01:00
Laurent Destailleur
8192e9dc67
FIX Missing token in form
2020-03-14 03:02:49 +01:00
Laurent Destailleur
a437125962
Merge pull request #13341 from OPEN-DSI/new-takepos-numbering-modules
...
NEW add numbering module for cash desk
2020-03-13 16:58:27 +01:00
Laurent Destailleur
33c5db9cc3
Prepare code for the new pagination possibility
2020-03-13 13:07:11 +01:00
VESSILLER
1379b2ce87
FIX travis errors
2020-03-12 18:21:44 +01:00
VESSILLER
70ebc61c1f
Module TakePos - NEW add numbering module for cash desk
2020-03-12 17:43:59 +01:00
Laurent Destailleur
967d4223c6
FIX #13277
2020-03-12 16:15:48 +01:00
Laurent Destailleur
d380da3f4c
Merge pull request #13250 from FHenry/dev_fix_createLineWithCOrrectLink
...
NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other documents lines the id of original lines and origin class line rather than origin object id and origin object type
2020-03-12 12:57:04 +01:00
Scrutinizer Auto-Fixer
f413ce6aac
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-12 11:45:44 +00:00
florian HENRY
eaa9d22783
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_createLineWithCOrrectLink
2020-03-12 09:45:04 +01:00
florian HENRY
29b2ea77d5
NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other document s lines the id of origin lines and origin class line rather than origin object id and origin object type
2020-03-12 09:44:43 +01:00
Laurent Destailleur
a9847f0d40
Merge pull request #13308 from TobiasSekan/NewCategoryFilterForBankList
...
NEW category filter for bank list
2020-03-11 16:50:12 +01:00
Laurent Destailleur
e1c7222172
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-09 20:39:05 +01:00
Laurent Destailleur
e66313d47e
FIX use bad var to check if total is positive for each VAT rate when
...
validating invoice.
2020-03-09 20:06:47 +01:00
Laurent Destailleur
82f0d8a3bc
Fix bad params
2020-03-09 17:38:47 +01:00
Tobias Sekan
9dd362a22c
NEW Category filter on bank list
2020-03-09 11:43:15 +01:00
Laurent Destailleur
3edc3dd382
Fix fields definition
2020-03-08 20:10:31 +01:00
Laurent Destailleur
343a80fd3d
Fix table fields
2020-03-08 19:25:00 +01:00
Laurent Destailleur
054ffb7547
Depreciate variables not used by Dolibarr.
2020-03-06 14:38:06 +01:00
Laurent Destailleur
ad9d0a3472
Fix graph of product distribution when too much record
2020-03-06 12:45:02 +01:00
Laurent Destailleur
0bd2740779
NEW Can force position of legend of graph on right (instead of top)
2020-03-05 17:23:19 +01:00
Laurent Destailleur
aa1552dbc0
Enhance graphs
2020-03-05 00:17:16 +01:00
Laurent Destailleur
7d0d0aa75a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2020-03-04 01:56:50 +01:00
Laurent Destailleur
0b37c2c201
FIX #13263
2020-03-04 00:53:07 +01:00
Laurent Destailleur
71f19b4e5e
FIX #13267
2020-03-04 00:38:04 +01:00
Laurent Destailleur
70d4e5d7e3
Fix button should not be visible
2020-03-03 23:51:17 +01:00
Laurent Destailleur
2b6aaa652d
Merge pull request #13256 from ATM-Marc/NEW_list_multicurrency
...
NEW: add multicurrency columns to document lists
2020-03-03 23:12:53 +01:00
Laurent Destailleur
7866f89585
Merge pull request #13260 from atm-quentin/FIX_ecm_files
...
FIX ecm_files didnt match cause document ref contained "/"
2020-03-03 23:09:02 +01:00
Laurent Destailleur
21173b8b9d
Merge pull request #13262 from ptibogxiv/patch-312
...
FIX doc
2020-03-03 22:53:51 +01:00
Laurent Destailleur
c3137142fe
Merge pull request #13252 from aspangaro/12.0_a20
...
FIX: Nowrap on amount
2020-03-03 21:44:54 +01:00
ptibogxiv
a71356f0ed
FIX doc
2020-03-03 13:41:19 +01:00
atm-quentin
9446138951
FIX ecm_files didnt match cause document ref contained "/"
2020-03-03 12:07:18 +01:00
Alexandre SPANGARO
aeb3f70df7
FIX: Nowrap on amount
2020-03-03 07:26:51 +01:00
Laurent Destailleur
46bf65704a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-02 21:59:56 +01:00
Laurent Destailleur
87fe2e691b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/product/stats/facture.php
htdocs/product/stats/facture_fournisseur.php
2020-03-02 21:59:34 +01:00
Laurent Destailleur
c9d7ea8998
Merge pull request #13241 from ptibogxiv/patch-309
...
NEW: api invoice get by ref
2020-03-02 21:39:17 +01:00
Laurent Destailleur
c8b51066e5
NEW Add due date in feature "Export accounting documents"
2020-03-02 16:00:07 +01:00
ptibogxiv
844775501d
Update api_invoices.class.php
2020-03-01 18:46:12 +01:00
ptibogxiv
de30410adc
Update api_invoices.class.php
2020-03-01 18:43:20 +01:00
stickler-ci
b074c689a6
Fixing style errors.
2020-03-01 17:35:12 +00:00
ptibogxiv
6ee8fa4e8a
NEW: api invoice get by ref
2020-03-01 18:33:13 +01:00
Alexandre SPANGARO
da99c89c26
FIX: typo on ckeck method
2020-03-01 05:21:51 +01:00
Laurent Destailleur
f2dba4f621
Merge pull request #13227 from aspangaro/12.0_a16
...
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
2020-02-29 13:02:43 +01:00
Laurent Destailleur
f0d458682d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-29 00:15:17 +01:00
Laurent Destailleur
f5a07dfb7e
Add status into popup
2020-02-28 18:57:17 +01:00
Laurent Destailleur
87b3cf9765
FIX Bad link to template invoices
2020-02-28 12:01:43 +01:00
Laurent Destailleur
a3e56994b6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/admin/company.php
htdocs/compta/tva/document.php
htdocs/core/lib/files.lib.php
htdocs/main.inc.php
2020-02-27 18:35:32 +01:00
Marc de Lima Lucio
5d1f91f8ac
FIX: muticurrency columns: remove useless column totals that mix currencies together
2020-02-27 17:37:36 +01:00
Marc de Lima Lucio
6d728f12ba
NEW: invoice list: enable multicurrency columns
2020-02-27 14:10:00 +01:00
Alexandre SPANGARO
86d9622360
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
2020-02-27 10:44:04 +01:00
Laurent Destailleur
9bc5eb44ca
FIX #13182
2020-02-26 20:25:26 +01:00
Laurent Destailleur
0646b1a7a9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ihm.php
2020-02-26 17:04:14 +01:00
Laurent Destailleur
ef9fe73d96
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/index.php
2020-02-26 17:02:23 +01:00
Laurent Destailleur
921dacf695
Fix remove $_POST
2020-02-26 16:58:45 +01:00
Laurent Destailleur
114e41108d
FIX sort link
2020-02-26 06:43:58 +01:00
Laurent Destailleur
c38e88ca46
FIX Bad sort link in accounting report
2020-02-26 06:43:52 +01:00
Laurent Destailleur
4831d22354
FIX sort link
2020-02-26 06:43:21 +01:00
Laurent Destailleur
6cf6719cfb
FIX Bad sort link in accounting report
2020-02-26 06:39:02 +01:00
ATM john
4865e34cc2
fix missing visibility
2020-02-25 23:02:13 +01:00
Laurent Destailleur
a18fda6b3d
Fix data on popup
2020-02-25 19:59:53 +01:00
Laurent Destailleur
d172a95dfe
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-25 14:37:04 +01:00
Laurent Destailleur
457d0668c8
Look and feel v12
2020-02-24 05:23:34 +01:00
Laurent Destailleur
6366881f91
FIX #13175
2020-02-24 00:41:25 +01:00
ATM john
13790422dc
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-02-24 00:18:37 +01:00
Laurent Destailleur
f931b92d36
Merge branch 'new-takepos-batch-decrement' of
...
https://github.com/OPEN-DSI/dolibarr into develop
# Conflicts:
# htdocs/langs/en_US/errors.lang
2020-02-23 22:49:03 +01:00
Laurent Destailleur
189c0d675b
Fix memory report. Xdebug no more required. Try = null instead of unset.
2020-02-23 22:05:59 +01:00
Laurent Destailleur
0d474b2ec9
CSS
2020-02-22 14:20:42 +01:00
Laurent Destailleur
1d34ef213c
Fix error management
2020-02-22 12:19:46 +01:00
ATM john
4117aa56a2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-02-22 11:19:49 +01:00
Frédéric FRANCE
8d507c4f32
fix workflow with multicurrency
2020-02-21 18:12:48 +01:00
Laurent Destailleur
c0098188af
Merge pull request #13154 from frederic34/patch-7
...
fix workflow with multicurrency
2020-02-21 18:12:27 +01:00
Scrutinizer Auto-Fixer
e44865d8b5
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-21 16:53:37 +00:00
Laurent Destailleur
89b7c8dfd6
NEW Can select which element to export in export accounting documents.
2020-02-21 14:20:05 +01:00
VESSILLER
ec19b2feef
FIX phpcs nestling too high level
2020-02-21 12:00:16 +01:00
VESSILLER
71c9b94b22
NEW add const CASHDESK_FORCE_DECREASE_STOCK to force batch decrementation
2020-02-21 11:08:34 +01:00
Frédéric FRANCE
3df3a2560c
fix workflow with multicurrency
2020-02-20 15:11:31 +01:00
Laurent Destailleur
52c7f908a0
Doxygen
2020-02-20 14:02:27 +01:00
Laurent Destailleur
44eda2d4ad
Fix doxygen
2020-02-20 13:42:43 +01:00
Laurent Destailleur
e73d83767c
Fix phpcs
2020-02-20 12:35:48 +01:00
Laurent Destailleur
7796724d63
Update list.php
2020-02-20 01:07:41 +01:00
Laurent Destailleur
960302c012
Merge branch 'develop' into patch-35
2020-02-20 01:07:08 +01:00
Laurent Destailleur
895503d2eb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/index.php
htdocs/core/class/CMailFile.class.php
2020-02-20 00:21:25 +01:00
Laurent Destailleur
44c2909696
FIX Multicompany compatibility
2020-02-19 16:08:33 +01:00
Laurent Destailleur
3fafbb372b
Remove call of $mc->dao than hangs. Replaced with $mc use.
2020-02-19 15:51:27 +01:00
Laurent Destailleur
1dd5ba093d
Prepare PHP v8 - mktime() and gmmktime() are no more allowed
2020-02-19 12:11:16 +01:00
stickler-ci
028566616d
Fixing style errors.
2020-02-19 11:07:42 +00:00
John Botella
6acf10c0d4
extend retained warranty to be available for all invoices
2020-02-19 11:54:55 +01:00
Pierre Ardoin
bebc37abe3
Update list.php
2020-02-19 08:54:10 +01:00
Pierre Ardoin
34d7fb887f
Show project Ref support if enable
...
Add search and Project Ref column in the list, only if project module is enable.
2020-02-19 08:50:49 +01:00
Laurent Destailleur
d0d352be1a
FIX #13118
2020-02-19 03:37:28 +01:00
Laurent Destailleur
43b173ef76
FIX #13131
2020-02-19 01:23:54 +01:00
Laurent Destailleur
f4f3efec62
Fight against $_POST
2020-02-16 19:33:58 +01:00
Laurent Destailleur
35ada37d4d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal/list.php
htdocs/filefunc.inc.php
2020-02-14 19:14:26 +01:00
Laurent Destailleur
58ad62aa7b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-02-14 19:12:11 +01:00
Laurent Destailleur
bb895cb1d8
FIX ref_client not visible in tooltip.
2020-02-13 18:00:59 +01:00
Laurent Destailleur
c196342fd8
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-02-13 15:44:06 +01:00
Laurent Destailleur
ec30938a07
Fix phpcs
2020-02-13 15:43:53 +01:00
Laurent Destailleur
306b8d190f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-13 15:42:54 +01:00
Laurent Destailleur
c6c941e09a
Fix phpcs
2020-02-13 15:42:41 +01:00
Scrutinizer Auto-Fixer
011803ac71
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-13 11:36:05 +00:00
Marc de Lima Lucio
fa78af1996
Merge branch 'FIX_8.0_situation_excess_paid' of github.com:ATM-Marc/dolibarr into 11.0
2020-02-13 12:18:16 +01:00
Laurent Destailleur
9e165a782f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-13 11:58:23 +01:00
Laurent Destailleur
e511deb8e7
FIX #13096
2020-02-13 11:39:08 +01:00
Laurent Destailleur
700e01d661
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/stats/cabyprodserv.php
2020-02-12 22:50:56 +01:00
Laurent Destailleur
75774ec6c9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-12 20:30:30 +01:00
Laurent Destailleur
7931734ecb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modUser.class.php
2020-02-12 20:30:20 +01:00
Marc de Lima Lucio
b1b00450a9
FIX: situation invoice: bad amount for previous payments because of local variable overwriting a more global one
2020-02-12 12:10:48 +01:00
Marc de Lima Lucio
de8660fb55
FIX: situation invoice: allow excess paid to be converted to discount
2020-02-12 12:09:03 +01:00
stickler-ci
27dd9aec9f
Fixing style errors.
2020-02-11 16:12:48 +00:00
John Botella
02f268ea4e
FIX - hasDelay for retained warranty
2020-02-11 16:54:27 +01:00
stickler-ci
416cb3016d
Fixing style errors.
2020-02-11 13:15:23 +00:00
oscim
8b67793409
report and apply GETPOST method
...
report and apply GETPOST method for $dateech, $dateperiod, $label
2020-02-11 14:13:08 +01:00
Laurent Destailleur
f70dd8ec06
Clean code. Load thirdparty for correct lang before generating doc
2020-02-10 00:22:53 +01:00
Laurent Destailleur
5f507b2df5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/compta/tva/card.php
2020-02-08 16:01:41 +01:00
Laurent Destailleur
716f765ce1
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
2020-02-08 16:00:06 +01:00
Laurent Destailleur
1a167aa5b4
Update card.php
...
Conflicts:
htdocs/compta/tva/card.php
2020-02-08 15:12:55 +01:00
Laurent Destailleur
10790420ba
Merge pull request #13051 from oscim/patch-19
...
report and apply GETPOST method for $datev and $datep
2020-02-08 15:07:18 +01:00
Laurent Destailleur
544e05a7dd
Update card.php
2020-02-08 15:06:45 +01:00
Laurent Destailleur
9f9002d6a6
Update field definition
2020-02-07 16:05:04 +01:00
Laurent Destailleur
fe7b79c83c
Fix definition of objects
2020-02-07 15:51:14 +01:00
atm-lena
ecea726323
FIX CA by prod list filter
2020-02-07 15:01:37 +01:00
oscim
e408ea463c
report and apply GETPOST method for $datev and $datep
...
fix for usage GETPOST() for input $datev and $datep
And report definition $datev and $datep in top ection file for support GET params for action create
2020-02-07 09:31:58 +01:00
Laurent Destailleur
9c73bb1aef
NEW Can create an deposit from order using a percentage of qty.
2020-02-06 14:15:41 +01:00
Laurent Destailleur
4f3cc87077
FIX Confusion between 'bank reconciled' and 'accounted'. Show both data
2020-02-05 19:23:38 +01:00
Laurent Destailleur
30fa8940a9
FIX Confusion between 'bank reconciled' and 'accounted'. Show both data
2020-02-05 19:23:00 +01:00
Laurent Destailleur
f3e27695e2
FIX Avoid deletion of bank record if in accounting
2020-02-05 16:35:50 +01:00
Laurent Destailleur
44ed5980f5
FIX Avoid deletion of bank record if in accounting
2020-02-05 16:35:09 +01:00
Laurent Destailleur
1875b6a49b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/security2.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
2020-02-05 14:53:47 +01:00
Laurent Destailleur
af7a5b510d
Fix phpcs
2020-02-04 14:47:30 +01:00
Laurent Destailleur
37617bbce8
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-03 03:48:27 +01:00
Laurent Destailleur
a30da7860f
FIX #12892
2020-02-03 03:32:31 +01:00
Laurent Destailleur
4765198af2
Clean code from using deprecated field amount
2020-02-02 19:03:37 +01:00
Laurent Destailleur
d827e3289a
Removed no more used field "amount" in llx_facture
2020-01-31 15:12:17 +01:00
Scrutinizer Auto-Fixer
5fda829023
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-30 00:48:28 +00:00
Laurent Destailleur
7b10c2440b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-29 23:08:42 +01:00
Michael Jeanmotte
f1f83656f1
Feature Request: Dolibarr API - [GET] /bankaccounts/{id}/lines : add sqlfilters #11259
2020-01-29 22:54:35 +01:00
Laurent Destailleur
e796a2eda9
Add fields array on common objects
2020-01-29 22:38:14 +01:00
Laurent Destailleur
1e879126cd
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/exports/class/export.class.php
2020-01-29 19:28:06 +01:00
Laurent Destailleur
60f772d285
FIX Pending amount to pay must be zero if invoice close for anticipated
...
payment.
2020-01-29 17:56:09 +01:00
oscim
d224c711cf
Update result.php
...
fix error for display detail of account 6xxx. this account is < 0, but is not null
2020-01-29 11:07:30 +01:00
oscim
862da5b646
Update result.php
...
fix error for display detail of account 6xxx. this account is < 0, but is not null
2020-01-29 08:08:15 +01:00
Laurent Destailleur
9acda3545e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-28 17:52:01 +01:00
Laurent Destailleur
c87fdc96ce
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/supplier/index.php
2020-01-28 17:51:32 +01:00
Laurent Destailleur
80707d6a5e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-28 17:24:26 +01:00
Laurent Destailleur
3a9e238dc6
FIX Missing value of $formconfirm as parameters of hook
2020-01-28 12:00:27 +01:00
Pierre Ardoin
4cb423e5c7
Add un specific link to late invoices
...
Before : $response->url_late always == $response->url
After : if $response->nbtodolate >= 1 : $response->url_late redirects to list with only late unpaid customer invoices.
2020-01-27 09:49:49 +01:00
Laurent Destailleur
df478dc170
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-27 01:53:49 +01:00
Laurent Destailleur
7438f92912
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/demandes.php
htdocs/compta/tva/document.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/societe/card.php
2020-01-27 01:50:02 +01:00
Laurent Destailleur
cf6b9f7d03
Merge pull request #12918 from atm-florian/11_fixWithdrwLineList
...
fix SEPA lines with limit select and working pagination
2020-01-26 22:25:01 +01:00
Laurent Destailleur
14f1f98b59
Merge pull request #12919 from atm-florian/10_fixCreateSEPALimitAndPagination
...
10 fix create sepa limit and pagination
2020-01-26 22:24:11 +01:00
Pierre Ardoin
c64acb1a9c
Permissions Issue
...
fixes an issue that displayed the "restricted area" banner despite user permissions.
2020-01-25 15:19:46 +01:00
Laurent Destailleur
0f2141269a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-01-25 14:43:57 +01:00
Laurent Destailleur
f2771b3365
FIX #12896
2020-01-25 14:23:23 +01:00
Laurent Destailleur
09f809f347
FIX #12913
2020-01-25 14:03:24 +01:00
Laurent Destailleur
08d8670bb3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/class/product.class.php
2020-01-24 20:12:27 +01:00
Laurent Destailleur
209ebfbe2f
Fix trans
2020-01-24 16:14:52 +01:00
Laurent Destailleur
923e315dae
Debug cashfence feature
2020-01-24 15:59:36 +01:00
Laurent Destailleur
779cd94b0e
Debug cashfence feature
2020-01-24 15:26:18 +01:00
florian HENRY
2f0144b19b
Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11_fixWithdrwLineList
2020-01-24 13:22:24 +01:00
florian HENRY
dc3eafccb9
add hook into withdraw list
2020-01-24 13:22:04 +01:00
Laurent Destailleur
540713510e
Fix load of segment prices not required for virtual stock change
...
virtual stock must include production (WIP)
2020-01-23 21:03:15 +01:00
Laurent Destailleur
12b4909c45
Fix load of segment prices not required for virtual stock change
...
virtual stock must include production (WIP)
2020-01-23 20:59:18 +01:00
Laurent Destailleur
f2ab3426ea
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-23 19:42:22 +01:00
Laurent Destailleur
e1123c63a9
Fix field label
2020-01-23 19:42:00 +01:00
Laurent Destailleur
df90e432d4
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/sociales/card.php
2020-01-23 19:39:05 +01:00
Laurent Destailleur
b74d37338b
Fix trans
2020-01-23 19:37:34 +01:00
Laurent Destailleur
a44d534e64
Fix label
2020-01-23 19:32:34 +01:00
Laurent Destailleur
f59cb65a21
Fix label
2020-01-23 19:32:15 +01:00
Laurent Destailleur
423be8a139
FIX Label of status of social contribution
2020-01-23 19:30:02 +01:00
Laurent Destailleur
5d4ea0b4c4
FIX Label of status of social contribution
2020-01-23 19:28:56 +01:00
florian HENRY
62caf3cbfc
fix create SEPA withdraw with limit select and working pagination
2020-01-23 17:59:50 +01:00
florian HENRY
5ad5578f40
fix create SEPA withdraw with limit select and working pagination
2020-01-23 17:47:00 +01:00
florian HENRY
210e0511d0
fix create SEPA withdraw with limit select and working pagination
2020-01-23 17:45:16 +01:00
florian HENRY
fd0daad959
fix SEPA line with limit select and working pagination
2020-01-23 16:49:06 +01:00
Laurent Destailleur
d3411a79ef
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-22 14:11:44 +01:00
Laurent Destailleur
4686be34d2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/product/class/product.class.php
htdocs/stripe/charge.php
2020-01-22 14:10:46 +01:00
Laurent Destailleur
a9790f355d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-21 11:32:40 +01:00
Laurent Destailleur
dc1600b3c2
Fix responsive
2020-01-21 10:54:31 +01:00
Laurent Destailleur
2d07a08e55
Fix init of specimen
2020-01-21 00:22:57 +01:00
Laurent Destailleur
80483fc085
Fix init of specimen
2020-01-21 00:20:03 +01:00
Laurent Destailleur
92856788a3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-20 18:39:46 +01:00
Laurent Destailleur
5f64531e9b
Fix look and feel v11
2020-01-20 12:39:25 +01:00
Laurent Destailleur
b8938b8d19
Fix look and feel v11
2020-01-20 02:18:00 +01:00
Laurent Destailleur
7c5485288b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-19 20:34:20 +01:00
Laurent Destailleur
62b9fbb67f
Fix link
2020-01-19 20:33:55 +01:00
Laurent Destailleur
6b6c9efe5e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-19 19:56:21 +01:00
Laurent Destailleur
5a702eb50c
Fix filter on amount
2020-01-19 19:55:57 +01:00
Laurent Destailleur
99f679493b
Fix search
2020-01-19 19:51:40 +01:00
Laurent Destailleur
526ae83e8f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-19 19:49:16 +01:00
Laurent Destailleur
e679e05f57
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-19 19:49:04 +01:00
Laurent Destailleur
19ab802aaf
Fix disabling of balance
2020-01-19 19:48:19 +01:00
Laurent Destailleur
d6bdbccf4f
Fix link
2020-01-19 19:33:57 +01:00
Pierre Ardoin
e4eb8883fe
Fix double display of create credit note button
...
Before: Display of the "Create credit note" button twice for standard invoices when situation invoices are activated.
After: Displays a single button "Create a credit note"
2020-01-19 19:10:10 +01:00
Laurent Destailleur
8c8d492a48
FIX Protection to avoid blocking situation with negative lines
2020-01-19 15:19:07 +01:00
Laurent Destailleur
6fd717539d
Merge pull request #12887 from Dolibarr/scrutinizer-patch-5
...
Scrutinizer Auto-Fixes
2020-01-18 20:21:29 +01:00
Laurent Destailleur
24d439845b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
2020-01-18 20:20:25 +01:00
Laurent Destailleur
178dd518cf
Merge branch 'develop' into scrutinizer-patch-5
2020-01-18 19:36:36 +01:00
Scrutinizer Auto-Fixer
8744f6ab7b
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-18 15:17:07 +00:00
Laurent Destailleur
73d56358e1
Fix bad param
2020-01-18 16:13:10 +01:00
Laurent Destailleur
82deccea08
Fix bad link
2020-01-17 14:41:42 +01:00
Laurent Destailleur
fe6bcd8a31
Fix missing value in popup
2020-01-17 14:32:22 +01:00
Laurent Destailleur
c556f60c89
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-16 18:13:35 +01:00
Laurent Destailleur
76e7c147b3
Look and feel v11
2020-01-16 18:03:57 +01:00
Laurent Destailleur
849c78f4cd
Doc
2020-01-16 10:12:39 +01:00
Laurent Destailleur
ad7278e6a5
FIX Label of DEPOSIT on screen
...
Fix look and feel v11
2020-01-16 02:48:24 +01:00
Laurent Destailleur
76aedc9264
Merge pull request #12365 from aspangaro/11.0_a2
...
NEW Invoice list - Add date start & date end
2020-01-15 20:50:20 +01:00
Laurent Destailleur
4e4a810484
Merge pull request #12368 from aspangaro/11.0_a5
...
NEW Various payment list - Add search date start & date end & subledger account
2020-01-15 17:51:59 +01:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category
2020-01-15 14:21:06 +01:00
Laurent Destailleur
b47db086cb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/inventory/class/inventory.class.php
htdocs/product/inventory/list.php
2020-01-10 14:30:42 +01:00
Laurent Destailleur
d97a59ac4a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
ChangeLog
htdocs/comm/remise.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/variants/combinations.php
2020-01-10 14:25:26 +01:00
Laurent Destailleur
9ebdd82edb
Fix We must refuse to delete a various payment if payment was dispatched
...
in accountancy.
2020-01-10 02:43:24 +01:00
Laurent Destailleur
675ce3b32f
Fix sql error on update of subledger account on a various payment
...
Fix warning message that was not accurate
2020-01-10 02:20:08 +01:00
atm-arnaud
ae4554af65
FIX drafts are now implemented for stats
2020-01-08 11:27:52 +01:00
Laurent Destailleur
ccceaac358
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-06 17:20:54 +01:00
Laurent Destailleur
ec2ea612ae
Fix GETPOST
2020-01-06 17:19:49 +01:00
Laurent Destailleur
57bbac2015
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-06 14:09:46 +01:00
Laurent Destailleur
58ff3e563d
Fix link a href
2020-01-06 02:21:42 +01:00
Laurent Destailleur
6dcba0f053
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-04 14:27:55 +01:00
Laurent Destailleur
38de69f5a9
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/comm/action/list.php
htdocs/compta/bank/releve.php
htdocs/compta/salaries/card.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/boxes.lang
htdocs/langs/en_US/main.lang
htdocs/product/class/product.class.php
htdocs/product/reassort.php
htdocs/product/stock/product.php
htdocs/projet/element.php
2020-01-04 14:20:25 +01:00
Laurent Destailleur
b9e0f8999f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2020-01-04 14:03:21 +01:00
Alexandre SPANGARO
f14aaf5e50
FIX Some problems on conciliation with others modules
2020-01-03 16:35:02 +01:00
Laurent Destailleur
2c20b25a29
Suggest another value than "bad customer" to close an invoice paid
2020-01-02 18:02:53 +01:00
Laurent Destailleur
afd32135f2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/takepos/invoice.php
2020-01-01 22:37:13 +01:00
Laurent Destailleur
2e8fd25299
FIX Local taxes was not correctly supported in TakePOS.
2020-01-01 21:54:47 +01:00
Laurent Destailleur
b50cb2a65d
Fix solution to solve a blocking situation (credit note both refunded
...
and consumed)
2020-01-01 19:04:14 +01:00
Laurent Destailleur
eae0800021
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-01 11:24:10 +01:00
Laurent Destailleur
f11a119ab0
Clean dead code
2019-12-31 16:50:21 +01:00
Laurent Destailleur
175894db26
FIX Status of direct debit payment after setting to paid.
2019-12-31 14:48:52 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-31 13:57:40 +01:00
Laurent Destailleur
8202a67e4e
Fix look and feel v11
2019-12-25 23:15:56 +01:00
Alexandre SPANGARO
44400b7866
FIX : Some issues on salary payment
2019-12-24 07:22:25 +01:00
Alexandre SPANGARO
ab0f77b467
Merge remote-tracking branch 'upstream/develop' into 11.0_a5
2019-12-23 21:15:17 +01:00
Alexandre SPANGARO
384651db46
Merge remote-tracking branch 'upstream/develop' into 11.0_a2
2019-12-23 21:01:17 +01:00
Laurent Destailleur
9a08a6bf6d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/categories/traduction.php
htdocs/compta/facture/class/facture.class.php
htdocs/contact/card.php
htdocs/core/modules/modSociete.class.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/langs/en_US/products.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
htdocs/margin/tabs/thirdpartyMargins.php
2019-12-23 14:13:26 +01:00
VESSILLER
c39e45b81a
FIX set due date in object in create invoice
2019-12-23 10:57:51 +01:00
Laurent Destailleur
daae053e39
Debug CashFence feature
2019-12-22 20:02:18 +01:00
Laurent Destailleur
3036ff637f
Fix bad url
2019-12-22 19:49:39 +01:00
Laurent Destailleur
3ae5901a64
Fix look and feel v11
2019-12-22 19:46:36 +01:00
Laurent Destailleur
dd9f25b13a
CSS
2019-12-22 16:33:15 +01:00
Laurent Destailleur
39737c7c4b
Fix opacity on text with a href links inside
...
Fix var not defined
2019-12-22 13:19:14 +01:00
Laurent Destailleur
d9a1e1b348
Fix several non dolibarr behaviour on input of salary payments
2019-12-19 10:01:11 +01:00
Laurent Destailleur
f44b85f557
Fix $_SESSION['newtoken'] must be newToken()
2019-12-18 23:12:31 +01:00
Laurent Destailleur
db5672ae90
Fix creation/update of expense reports
...
Fix export of accounting documents
2019-12-18 23:07:26 +01:00
Scrutinizer Auto-Fixer
455178ff73
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-18 14:20:36 +00:00
Laurent Destailleur
138215fc3f
Add INVOICE_ALLOW_FREE_REF as a quick hack to solve trouble with non
...
european users.
2019-12-16 22:30:16 +01:00
Scrutinizer Auto-Fixer
c8baaa2995
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-16 12:06:25 +00:00
Laurent Destailleur
49a8b4544e
Fix look and feel v11
2019-12-15 19:32:37 +01:00
Laurent Destailleur
9685b56375
Fix warning
2019-12-15 15:03:22 +01:00
Laurent Destailleur
838633d0de
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/api/class/api_setup.class.php
htdocs/compta/facture/card.php
htdocs/compta/stats/index.php
htdocs/core/actions_massactions.inc.php
htdocs/install/upgrade2.php
htdocs/loan/card.php
htdocs/loan/document.php
htdocs/loan/info.php
htdocs/loan/note.php
htdocs/loan/schedule.php
htdocs/product/list.php
htdocs/ticket/card.php
htdocs/user/class/user.class.php
2019-12-14 14:53:49 +01:00
Laurent Destailleur
835d22f556
Merge branch 'develop' into doxygen_todo
2019-12-14 13:46:40 +01:00
Laurent Destailleur
8fbaae3fef
Merge pull request #12694 from frederic34/patch-8
...
doxygen
2019-12-14 13:43:47 +01:00
Frédéric FRANCE
57055bad03
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-13 14:36:00 +01:00
Regis Houssin
a527e72124
FIX #12688
2019-12-12 16:35:07 +01:00
Laurent Destailleur
ce47de453e
Fix HTML5
2019-12-12 10:31:08 +01:00
Frédéric FRANCE
9357bfd98e
doxygen
2019-12-12 08:17:14 +01:00
Frédéric FRANCE
269e53583d
doxygen
2019-12-11 23:46:12 +01:00
Frédéric FRANCE
66805a502a
doxygen
2019-12-11 22:53:57 +01:00
Frédéric FRANCE
c98ab917dd
doxygen
2019-12-11 20:33:58 +01:00
Laurent Destailleur
5454380834
CSS
2019-12-11 19:14:41 +01:00
Frédéric FRANCE
307bad1d2a
doxygen todo
2019-12-11 19:11:13 +01:00
Laurent Destailleur
738526e77e
Fix br
2019-12-10 14:04:50 +01:00
Laurent Destailleur
fe44d3a4fa
FIX #12674
2019-12-10 14:02:03 +01:00
Laurent Destailleur
2d97c0bb79
Try better fix for #12674
2019-12-10 13:55:45 +01:00
Laurent Destailleur
a77dc75bd4
Merge branch 'develop' into NEW_10.0_card_of_bill_created_from_template__add_link_to_template
2019-12-09 16:05:23 +01:00
Laurent Destailleur
2fd6c690c0
Merge pull request #12632 from atm-florianm/FIX_10.0_restore_filter_values_when_returning_to_list_from_card
...
FIX 10.0: add URL param "restore_last_search_values=1" to all backlinks pointing to lists
2019-12-09 15:59:55 +01:00
Laurent Destailleur
f28e4c14e8
FIX #12644
2019-12-09 13:40:26 +01:00
Laurent Destailleur
0a3b2987d1
Merge pull request #12657 from frederic34/patch-19
...
doxygen
2019-12-09 10:47:16 +01:00
Laurent Destailleur
eb0d20b77e
Fix label of country
...
Fix div empty
2019-12-09 09:16:59 +01:00
Frédéric FRANCE
c05ba624ce
Update deplacement.class.php
2019-12-08 22:46:22 +01:00
Frédéric FRANCE
3db84df60e
Update card.php
2019-12-08 22:45:10 +01:00
Frédéric FRANCE
6c5629b5a5
Update deplacement.class.php
2019-12-08 22:39:33 +01:00
Frédéric FRANCE
49f22facef
doxygen
2019-12-08 22:37:19 +01:00
Florian Mortgat
6227d14cf3
NEW 10.0: link to template of origin in bill cards for bills created from a template
2019-12-06 13:48:24 +01:00
Scrutinizer Auto-Fixer
4debd71281
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-06 08:26:49 +00:00
Laurent Destailleur
93d66d8213
Debug v11
2019-12-06 08:50:26 +01:00
Frédéric FRANCE
d9bfa62367
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-05 21:47:42 +01:00
Florian Mortgat
3f6715a377
FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list
2019-12-05 15:34:41 +01:00
Laurent Destailleur
5f148be56f
Fix responsive
2019-12-04 16:43:56 +01:00
Frédéric FRANCE
4c5c6b6ff1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-03 17:56:43 +01:00
Scrutinizer Auto-Fixer
36a74cd160
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-03 10:17:29 +00:00
Laurent Destailleur
6f7343b14f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-02 11:01:26 +01:00
Laurent Destailleur
6d81bc77cb
Fix look and feel v11
2019-12-02 11:00:09 +01:00
Laurent Destailleur
92070fa491
Fix name of variable $trigger_name into $triggersendname
2019-12-02 09:38:16 +01:00
Frédéric FRANCE
25ed2b930f
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-01 16:10:37 +01:00
Laurent Destailleur
3eec2430eb
Merge pull request #12585 from atm-john/develop_factoring_token_usage
...
Factoring token usage
2019-12-01 11:37:30 +01:00
Laurent Destailleur
790fdc881c
# WARNING: head commit changed in the meantime
...
Restore file for travis
2019-12-01 10:50:56 +01:00
Laurent Destailleur
6bf3af5d83
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
...
Conflicts:
htdocs/compta/tva/index.php
htdocs/core/lib/pdf.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
2019-12-01 10:30:22 +01:00
ATM John BOTELLA
773f823748
factoring token usage
2019-12-01 10:20:11 +01:00
Laurent Destailleur
1d564c2a39
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
...
Conflicts:
htdocs/core/class/notify.class.php
2019-12-01 00:58:01 +01:00
Laurent Destailleur
199b0c11af
Merge pull request #12572 from atm-maxime/fix_deposit
...
Fix deposit line was not translated in deposit invoice
2019-12-01 00:44:17 +01:00
Maxime Kohlhaas
3c639772d9
Fix #11228 : VAT dates regarding fiscal year
2019-11-30 17:16:16 +01:00
Maxime Kohlhaas
558669dd88
Fix #6497 : deposit lines were not translated
2019-11-30 16:14:16 +01:00
Laurent Destailleur
6944b67b1e
Merge pull request #12548 from frederic34/patch-8
...
functions return void
2019-11-30 01:25:04 +01:00
Frédéric FRANCE
6d8c59991d
doxygen
2019-11-28 23:21:42 +01:00
Frédéric FRANCE
06839e9a7f
functions return void
2019-11-28 22:34:53 +01:00
Scrutinizer Auto-Fixer
5f99e25c45
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-28 11:36:20 +00:00
Laurent Destailleur
8430ec4f50
Merge pull request #12534 from aspangaro/11.0_a8
...
Look & Feel v11
2019-11-28 12:18:39 +01:00
Frédéric FRANCE
b2912e688b
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-27 22:54:05 +01:00
Alexandre SPANGARO
0f6de0049c
Fix
2019-11-26 21:17:22 +01:00
Alexandre SPANGARO
659e3aca8e
Look & field v11
2019-11-26 21:14:44 +01:00
Alexandre SPANGARO
d910b05a38
Look & Feel v11
2019-11-26 20:28:24 +01:00
Frédéric FRANCE
4c4ae5b6e1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-26 08:10:40 +01:00
Frédéric FRANCE
f3f308fc1b
Update graph.php
2019-11-26 00:11:02 +01:00
Scrutinizer Auto-Fixer
e36ee63ab6
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-22 13:16:38 +00:00
Laurent Destailleur
f9092b1b8e
Fix responsive
2019-11-20 13:22:40 +01:00
Frédéric FRANCE
d182eee4bf
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-19 23:26:00 +01:00
Laurent Destailleur
fb70893229
Fix missing class reposition
2019-11-19 21:29:49 +01:00
Laurent Destailleur
07c01a821e
FIx #12466 manually (conflict pb)
2019-11-19 19:43:02 +01:00
Laurent Destailleur
5d7a1f1265
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/card.php
htdocs/core/class/extrafields.class.php
htdocs/langs/en_US/stocks.lang
2019-11-19 19:02:14 +01:00
Laurent Destailleur
2f3b4d239b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-11-19 18:56:12 +01:00
Laurent Destailleur
5b6f0cb101
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/class/extrafields.class.php
2019-11-18 21:19:10 +01:00
Frédéric FRANCE
2e5f539b2a
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-18 17:45:52 +01:00
Alexandre SPANGARO
1e2fd1f25a
Merge remote-tracking branch 'upstream/develop' into 11.0_a5
2019-11-17 21:55:25 +01:00
Scrutinizer Auto-Fixer
eba082320c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-16 22:25:24 +00:00
Laurent Destailleur
2689f7515c
Fix pb with colspan and extrafields.
...
Fix remove empty id
2019-11-16 14:38:05 +01:00
Frédéric FRANCE
6784ea9fae
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-16 09:21:57 +01:00
Laurent Destailleur
8db4eff108
Merge pull request #12437 from Dolibarr/scrutinizer-patch-8
...
Scrutinizer Auto-Fixes
2019-11-14 12:10:44 +01:00
Scrutinizer Auto-Fixer
f197196719
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:46 +00:00
gauthier
a5635825f3
FIX : wrong invoice id for fetchObjetctLinked
2019-11-14 12:09:32 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:15 +00:00
Frédéric FRANCE
a3e092b227
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-14 09:21:26 +01:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
...
Scrutinizer Auto-Fixes
2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
...
Scrutinizer Auto-Fixes
2019-11-14 08:50:06 +01:00
Frédéric FRANCE
446c66da62
use class CONST
2019-11-14 08:15:39 +01:00
Scrutinizer Auto-Fixer
b40ecc3933
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:02 +00:00
Scrutinizer Auto-Fixer
c66bce7ec6
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 17:31:18 +00:00
Laurent Destailleur
4340f85e3c
Add warning
2019-11-13 01:22:13 +01:00
Laurent Destailleur
453ffad9e8
Look and feel v11
2019-11-12 18:01:16 +01:00
Laurent Destailleur
2a67dd0f66
Look and feel v11
2019-11-12 17:43:27 +01:00
Laurent Destailleur
e79ac7081a
Look and feel v11
2019-11-12 17:37:05 +01:00
Laurent Destailleur
3430a88c72
Fix $conf not defined
2019-11-12 10:13:22 +01:00
Laurent Destailleur
c02cd80b75
Clean code
2019-11-12 10:11:30 +01:00
Scrutinizer Auto-Fixer
c85e54b08c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-12 08:46:08 +00:00
Scrutinizer Auto-Fixer
df664e790b
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-11 23:15:34 +00:00
Laurent Destailleur
2ccef4e469
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
2019-11-11 19:10:35 +01:00
stickler-ci
fae5d56d34
Fixing style errors.
2019-11-10 10:04:11 +00:00
Philippe GRAND
b0d68a6de1
add some comment
2019-11-10 11:05:30 +01:00
stickler-ci
4dda9edeb6
Fixing style errors.
2019-11-10 10:01:28 +00:00
Philippe GRAND
f960191671
add some comment
2019-11-10 11:02:44 +01:00
Alexandre SPANGARO
86b90b115f
NEW Invoice list - Add date start & date end
2019-11-09 05:20:13 +01:00
Laurent Destailleur
89ecd6a72a
Merge pull request #12389 from Dolibarr/scrutinizer-patch-5
...
Scrutinizer Auto-Fixes
2019-11-08 15:53:57 +01:00
Laurent Destailleur
4fce0d3e7a
Fix not transversable
2019-11-08 15:52:57 +01:00
Scrutinizer Auto-Fixer
812d0af1d9
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-08 14:51:54 +00:00
Scrutinizer Auto-Fixer
2ecfe41810
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-08 09:53:31 +00:00
Laurent Destailleur
ba1f4f0ac6
Fix look and feel v11
2019-11-07 16:40:59 +01:00
Laurent Destailleur
c0b8684475
Merge pull request #12341 from inoveaconseil/bankStatementDocument
...
NEW add upload for account statement
2019-11-07 15:06:47 +01:00
Laurent Destailleur
c7e261a973
FIX #11907
2019-11-07 14:40:26 +01:00
Laurent Destailleur
5a4a421a8e
FIX #12372
2019-11-07 13:07:40 +01:00
Laurent Destailleur
cd5c359b83
Fix regression
2019-11-07 12:53:26 +01:00
Laurent Destailleur
4c44f3c109
Merge pull request #12366 from aspangaro/11.0_a3
...
NEW VAT list - Add date start & date end
2019-11-07 11:53:16 +01:00
Alexandre SPANGARO
b85dc0c5e5
NEW Various payment list - Add search date start & date end & subledger_account
2019-11-07 09:19:48 +01:00
Alexandre SPANGARO
fd45eeab83
NEW VAT list - Add date start & date end
2019-11-07 08:34:06 +01:00
Alexandre SPANGARO
e60b7a67fa
NEW Invoice list - Add date start & date end
2019-11-07 06:35:58 +01:00
Nicolas
f18bca7687
Merge remote-tracking branch 'origin/bankStatementDocument' into bankStatementDocument
2019-11-06 20:51:17 +01:00
Nicolas
4143988614
NEW Add upload document on account statement
2019-11-06 20:50:02 +01:00
Inovea Conseil
fed6ed8760
Merge remote-tracking branch 'Dolibarr/develop' into bankStatementDocument
2019-11-06 20:48:24 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent
2019-11-05 21:24:41 +01:00
Laurent Destailleur
94bd0f71d9
Fix pb with permission
2019-11-05 19:41:30 +01:00
Laurent Destailleur
17d5c385ff
FIX #12320 It is clearer that you can't change thirdparty when creating
...
invoice from template with a recurring rule.
2019-11-05 15:46:48 +01:00
stickler-ci
f537ae60b6
Fixing style errors.
2019-11-05 12:52:58 +00:00
Nicolas
991e1b2747
NEW Add upload document on account statement
2019-11-05 13:51:52 +01:00
Laurent Destailleur
ce1dec253f
FIX #11364
2019-11-05 12:47:38 +01:00
Frédéric FRANCE
3a729f9e7b
fix missing newtoken in form
2019-11-04 22:45:20 +01:00
Laurent Destailleur
a8b1a75ea3
Merge pull request #12325 from frederic34/patch-6
...
fix indent in card-rec.php
2019-11-04 21:11:34 +01:00
Laurent Destailleur
e61f28ed17
Merge pull request #12318 from grandoc/new_branch_04_11_2019
...
fix translation
2019-11-04 20:50:58 +01:00
Frédéric FRANCE
ac783b303d
Update card-rec.php
2019-11-04 20:47:25 +01:00
Laurent Destailleur
e60fff39d9
Fix phpcs
2019-11-04 20:36:55 +01:00
Laurent Destailleur
ec8bd6327d
Fix css
2019-11-04 18:53:46 +01:00
Laurent Destailleur
11500fb8d9
FIX confusion between permto... and permisstionto...
2019-11-04 15:33:49 +01:00
stickler-ci
4480d7dd88
Fixing style errors.
2019-11-04 14:09:43 +00:00
Philippe GRAND
2909f8141e
fix translation
2019-11-04 15:08:43 +01:00
Laurent Destailleur
99a4781a42
Fix better support for multicurrency for template invoices
2019-11-03 18:58:26 +01:00
Laurent Destailleur
630a150b09
Fix multicurrency rate must be visible if currency differs only
2019-11-03 17:48:16 +01:00
Laurent Destailleur
6f82c212a0
Finished migration to the new architecture of extrafields
2019-11-02 17:38:19 +01:00
Laurent Destailleur
89f1904793
Finish removing of ->attribute_label
2019-11-02 17:26:26 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid
...
replace deprecated user->societe_id by user->socid
2019-11-02 13:34:21 +01:00
Laurent Destailleur
6348227698
Merge pull request #12275 from frederic34/patch-8
...
css
2019-11-02 13:31:18 +01:00
Laurent Destailleur
d232b7a387
Merge pull request #12286 from grandoc/new_branch_01_11_2019
...
add some comment
2019-11-02 13:00:23 +01:00
Laurent Destailleur
45c77b4560
Renaming some libelle into label
2019-11-02 12:59:38 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid
2019-11-02 12:01:06 +01:00
Laurent Destailleur
c12e66e2a2
Merge branch 'develop' into new_branch_01_11_2019
2019-11-02 12:00:04 +01:00
Laurent Destailleur
68c971a2b5
All properties 'type_libelle' were renamed into 'type_label'.
2019-11-02 11:12:57 +01:00
Laurent Destailleur
82bda63920
Merge pull request #12296 from frederic34/patch-20
...
Update index.php
2019-11-02 10:09:55 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid
2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4
Look and feel v11
2019-11-01 23:58:14 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid
2019-11-01 21:39:20 +01:00
Laurent Destailleur
2d9135b6ad
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expedition/card.php
htdocs/holiday/list.php
2019-11-01 21:06:06 +01:00
Frédéric FRANCE
8b98df296f
Update info.php
2019-11-01 17:36:11 +01:00
Frédéric FRANCE
6dd8e7152c
Update index.php
2019-11-01 17:31:34 +01:00
Frédéric FRANCE
38b86d4bde
Update payments.php
2019-11-01 17:30:49 +01:00
Frédéric FRANCE
61873aa1a8
Update list.php
2019-11-01 17:29:21 +01:00
Frédéric FRANCE
5314ff70f5
Update index.php
...
in class ref and rowid are the same, lib is deprecated and is label
2019-11-01 17:26:53 +01:00
Laurent Destailleur
e3b5be7475
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
...
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
2019-11-01 12:52:03 +01:00
Philippe Grand
9fad5dc8fc
Update chargesociales.class.php
2019-11-01 11:16:47 +01:00
Philippe Grand
f568241a81
Update cashcontrol.class.php
2019-11-01 11:16:20 +01:00
stickler-ci
0c6938aa2a
Fixing style errors.
2019-11-01 09:44:29 +00:00
Philippe GRAND
4fe3e49502
add some comment
2019-11-01 10:42:14 +01:00
Laurent Destailleur
a0e377feb3
Look and feel v11
2019-10-31 22:11:26 +01:00
Laurent Destailleur
a1700e71be
Fix phpcs
2019-10-31 21:18:38 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid
2019-10-31 20:46:31 +01:00
Laurent Destailleur
607c38775d
Use popup
2019-10-31 14:57:05 +01:00
Laurent Destailleur
360b3a9550
NEW Ask the new label and new dates in confirm popup when cloning tax
2019-10-31 14:06:26 +01:00
Frédéric FRANCE
f202424432
css
2019-10-30 18:52:54 +01:00
Laurent Destailleur
923ab59e4e
Merge pull request #12219 from frederic34/patch-7
...
css
2019-10-30 03:13:14 +01:00
Laurent Destailleur
8849cd9897
Update index.php
2019-10-30 02:19:32 +01:00
Alexandre SPANGARO
db86dff7d1
Fix sign for VAT repaid in report
2019-10-29 17:10:10 +01:00
Frédéric FRANCE
a1f0245c79
clean indent in compta, contact directory
2019-10-26 18:13:20 +02:00
Frédéric FRANCE
79825e2193
start clean indent in compta directory
2019-10-26 14:42:25 +02:00
Frédéric FRANCE
99b338b468
Update index.php
2019-10-24 23:09:58 +02:00
Laurent Destailleur
b4eb14ee44
Use dolGetStatus
2019-10-24 16:43:23 +02:00
Laurent Destailleur
9a386da7f5
NEW Can crop/resize image attached on a bank record
2019-10-23 16:07:09 +02:00
Laurent Destailleur
31ad147e0e
Look and feel v11
2019-10-23 15:17:01 +02:00
Laurent Destailleur
02f559db5f
Use GETPOST
2019-10-23 15:07:21 +02:00
Laurent Destailleur
564f96c092
Fix scrutinizer warnings
2019-10-23 14:59:02 +02:00
Laurent Destailleur
b88968520b
Move code of extrafields to the new architecture
2019-10-22 17:08:37 +02:00
Laurent Destailleur
9be9f912af
Merge pull request #12192 from Ahuahuachi/develop
...
Translate documentation and minor code improvement
2019-10-22 12:32:40 +02:00
Alfredo Altamirano
f2e5a23547
Declaration of $soc should not be conditional
2019-10-20 13:47:39 -05:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces
2019-10-20 17:17:22 +02:00
Laurent Destailleur
5a4960f7ae
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/takepos/takepos.php
2019-10-20 15:30:28 +02:00
Frédéric FRANCE
a16b7bcda6
cut long lines
2019-10-19 19:16:28 +02:00
Laurent Destailleur
78ac543dee
Fix link to list
2019-10-18 20:01:47 +02:00
Laurent Destailleur
f85899742b
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
...
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-17 17:48:42 +02:00
Laurent Destailleur
f7782873a5
Look and feel v11
2019-10-17 15:58:24 +02:00
Laurent Destailleur
c58a006703
NEW Show POS application and terminal on invoice card.
2019-10-17 15:56:50 +02:00
Laurent Destailleur
5e12dcc6b1
Fix on FACTURE_ENABLE_NEGATIVE
2019-10-17 15:40:02 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-16 20:00:01 +02:00
Laurent Destailleur
b9ec45fd49
Clean code
2019-10-16 14:02:13 +02:00
Laurent Destailleur
e07e01580d
Replace deprecated code with new one
2019-10-16 03:34:32 +02:00
Laurent Destailleur
ebd8bc3645
Merge pull request #12107 from frederic34/patch-14
...
Update list.php
2019-10-14 20:57:01 +02:00
Laurent Destailleur
1f672221ec
Merge pull request #12106 from frederic34/patch-13
...
avoid ErrorBadValueForParamNotAString if not configured
2019-10-14 20:55:06 +02:00
Laurent Destailleur
5d02763288
Merge pull request #12129 from cyrilus/develop
...
ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning
2019-10-14 20:39:08 +02:00
Laurent Destailleur
dbdc62b028
Fix td
2019-10-14 18:41:46 +02:00
stickler-ci
4b7987374b
Fixing style errors.
2019-10-14 14:46:04 +00:00
Laurent Destailleur
dba9450b01
css
2019-10-14 16:03:12 +02:00
Laurent Destailleur
28339920b3
Translation
2019-10-14 16:00:03 +02:00
Laurent Destailleur
323f31d832
Trans frequency
2019-10-13 20:54:00 +02:00
Laurent Destailleur
f91b98d326
Add frequency in template invoice popup
2019-10-13 20:50:03 +02:00
Frédéric FRANCE
b424fc6e27
Update list.php
2019-10-12 18:57:08 +02:00
Frédéric FRANCE
cef935468d
Update list.php
2019-10-12 18:40:39 +02:00
Laurent Destailleur
bcc41c2a33
NEW Can filter on description on bank account transaction lists.
2019-10-12 13:19:10 +02:00
Frédéric FRANCE
9f59656589
fix typo inspired by grandoc
2019-10-11 23:08:33 +02:00
Laurent Destailleur
78bfc8997d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/link.class.php
2019-10-11 16:14:29 +02:00
Laurent Destailleur
d052e4f323
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/link.class.php
2019-10-11 16:13:26 +02:00
Laurent Destailleur
fc9c343af9
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/link.class.php
2019-10-11 16:12:01 +02:00
Laurent Destailleur
777c297353
FIX #12054
2019-10-11 15:42:27 +02:00
ro@t.com
2149b155d1
ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning
2019-10-10 15:57:26 +02:00
Laurent Destailleur
b34cbfad74
Rename const
2019-10-10 15:23:45 +02:00
Laurent Destailleur
015d51c169
NEW Add column of module source and POS terminal in invoice list.
2019-10-10 15:10:41 +02:00
Laurent Destailleur
b6c600c171
css
2019-10-10 11:44:03 +02:00
Frédéric FRANCE
0c8331b6d7
doxygen
2019-10-09 18:47:25 +02:00
Laurent Destailleur
dcc4fa6a64
Merge branch 'develop' into patch-255
2019-10-08 19:37:42 +02:00
Laurent Destailleur
5970ea5b79
Update releve.php
2019-10-08 15:48:29 +02:00
Laurent Destailleur
d6bf0fa483
Update releve.php
2019-10-08 15:47:47 +02:00
fuhraih
368b34c5c2
FIX #11835
...
FIX #11835 edit Bank Statements in second Page and so on not working
2019-10-08 15:34:35 +02:00
Laurent Destailleur
43a70e5548
Clean code to use the new $extrafields->attributes array
2019-10-08 09:28:50 +02:00
Laurent Destailleur
c2a7ae23bc
Merge pull request #12034 from aspangaro/11_faicon
...
Fix Fa-icon
2019-10-07 13:03:27 +02:00
Laurent Destailleur
52c06c1815
Fix css
2019-10-06 19:28:08 +02:00
Laurent Destailleur
866dcf18fe
Look and feel v11
2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61
NEW Code for extrafields uses the new array $extrafields->attributes
2019-10-06 14:41:52 +02:00
Laurent Destailleur
b883a8092a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/product.lib.php
htdocs/core/tpl/extrafields_list_search_input.tpl.php
htdocs/fourn/facture/card.php
htdocs/product/class/html.formproduct.class.php
2019-10-05 19:35:40 +02:00
Laurent Destailleur
0b9d27423d
FIX Can't modify vendor invoice if transfered into accountancy
2019-10-04 10:31:57 +02:00
Laurent Destailleur
6cd3d27885
Fix comparison
2019-10-04 09:54:52 +02:00
Alexandre SPANGARO
14381927c7
Fix Bank Fa-icon
2019-10-03 20:32:15 +02:00
Laurent Destailleur
1a66e0b05e
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/product/card.php
2019-10-03 17:53:59 +02:00
Laurent Destailleur
24570f7165
Look and feel v11. Picto are fontawesome.
2019-10-02 18:14:41 +02:00
Laurent Destailleur
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https
...
Move Gnu.org to https
2019-10-01 14:48:21 +02:00
Laurent Destailleur
1c92c2d8bc
Merge pull request #11993 from frederic34/patch-12
...
Update chargesociales.class.php for doxygen
2019-10-01 11:15:45 +02:00
Alexandre SPANGARO
16c6c9ae75
Merge remote-tracking branch 'upstream/develop' into 11.0_https
2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd
Merge branch 'develop' into 11.0_https
2019-10-01 06:11:43 +02:00
Frédéric FRANCE
3ba48fde93
Update api_invoices.class.php
2019-09-30 21:44:37 +02:00
Frédéric FRANCE
ea008aefd7
Update chargesociales.class.php
2019-09-30 20:21:10 +02:00
Frédéric FRANCE
0c908fb4ed
Update chargesociales.class.php
2019-09-30 20:13:43 +02:00
Laurent Destailleur
14f7e48fe5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-30 18:50:33 +02:00
Laurent Destailleur
a56b9e1ca9
The trigger BON_PRELEVEMENT has been renamed into
...
DIRECT_DEBIT_ORDER_CREATE.
2019-09-30 18:50:23 +02:00
Laurent Destailleur
cff8f582e7
Update bonprelevement.class.php
2019-09-30 18:47:18 +02:00
Laurent Destailleur
9d5b84ec44
Merge branch 'develop' into fix_9.0_withdraw_trigger_create_missing
2019-09-30 18:39:46 +02:00
Laurent Destailleur
2da5a506a9
Update facture.class.php
2019-09-30 18:25:03 +02:00
Laurent Destailleur
564e22009d
Update facture.class.php
2019-09-30 18:22:37 +02:00
Laurent Destailleur
4f356fa412
Merge pull request #11859 from altatof/avoir
...
FIX : allow standalone credit note even if no invoice
2019-09-30 18:12:55 +02:00
Laurent Destailleur
945dd0ae89
Update card.php
2019-09-30 18:12:43 +02:00
Laurent Destailleur
b28cd1bb57
Merge pull request #11972 from aspangaro/11.0_fa_icon
...
NEW Add fa_icon on load_fiche_titre
2019-09-30 15:26:28 +02:00
Alexandre SPANGARO
aec50d3ac9
NEW Add fa_icon on load_fiche_titre
2019-09-30 10:14:55 +02:00
ptibogxiv
4177c72ae0
Update facture.class.php
2019-09-29 15:46:28 +02:00
ptibogxiv
2e8b99606e
Update facture.class.php
2019-09-29 15:45:41 +02:00
ptibogxiv
5a096972c0
Update list.php
2019-09-29 15:42:39 +02:00
Laurent Destailleur
6966651d51
Standardize code to use dolSqlDateFilter
2019-09-28 13:22:05 +02:00
Alexandre SPANGARO
288aea190b
Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon
2019-09-28 06:09:40 +02:00
Alexandre SPANGARO
7f93f046e9
NEW Add fa_icon on load_fiche_titre
2019-09-28 06:02:25 +02:00
Laurent Destailleur
07b555b965
Merge branch 'develop' into patch-255
2019-09-27 15:23:15 +02:00
Laurent Destailleur
f5c839217a
Merge pull request #11914 from fmarcet/develop
...
Fix: Load invoices only if showed
2019-09-27 14:34:16 +02:00
Laurent Destailleur
f3bc319a78
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/takepos/takepos.php
2019-09-27 14:11:14 +02:00
Laurent Destailleur
6d1a571aed
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/product/dynamic_price/class/price_parser.class.php
2019-09-27 14:07:11 +02:00
Laurent Destailleur
5d45638248
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-09-27 14:02:23 +02:00
Laurent Destailleur
6858dce344
Rename table for categorie of warehouses
2019-09-27 13:28:28 +02:00
Alexandre SPANGARO
e38bb89a2e
NEW Add fa_icon on load_fiche_titre
2019-09-27 11:48:40 +02:00
Laurent Destailleur
99cfea1ff4
Update paiement_charge.php
2019-09-27 11:34:50 +02:00
Alexandre SPANGARO
b52e5d51e3
FIX colspan on VAT quadri report
2019-09-26 22:01:59 +02:00
Ferran Marcet
a8cc11d232
Merge branch 'developup' into develop
2019-09-24 13:38:11 +02:00
Alexandre SPANGARO
1b099733f5
Merge remote-tracking branch 'upstream/develop' into 11.0_translation
2019-09-24 08:42:57 +02:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
1c13a38ce9
Typo abscissa
2019-09-23 21:45:23 +02:00
Alexandre SPANGARO
e32772fdc5
Translate
2019-09-20 09:44:49 +02:00
gauthier
575e4d11d0
FIX : wrong test
2019-09-19 17:28:51 +02:00
Laurent Destailleur
a43253eab8
Fix for deposit not correctly closed
2019-09-17 18:49:56 +02:00
Laurent Destailleur
41a2a25729
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/ligne.php
2019-09-17 12:23:58 +02:00
Ferran Marcet
3f25a8d8d5
New: Load invoices only if showed
2019-09-17 09:38:08 +02:00
Ferran Marcet
e4984492b3
Dejarlo igual que develop
2019-09-17 09:32:43 +02:00
Ferran Marcet
c48fc3a2cf
Merge branch 'developup' into develop
...
# Conflicts:
# htdocs/compta/facture/fiche-rec.php
# htdocs/install/mysql/migration/9.0.0-10.0.0.sql
2019-09-17 09:27:42 +02:00
Laurent Destailleur
5233e7d8ad
FIX do not output return code on screen after a select of bank account
2019-09-16 18:29:04 +02:00
Laurent Destailleur
6bfba0b731
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
2019-09-15 15:17:38 +02:00
Alexandre SPANGARO
21e27389d4
NEW Bank Add an option for colorize background color of debit or credit movement
2019-09-14 20:58:12 +02:00
Alexandre SPANGARO
4420af683d
Fix Bank entries - nowrap on amount
2019-09-14 05:44:28 +02:00
Laurent Destailleur
56a99f6e6d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-12 11:22:13 +02:00
Laurent Destailleur
3f3282400a
FIX SQL syntax error and CSRF check on vat reports
2019-09-11 13:57:15 +02:00
Christophe Battarel
c8cb5886f4
correction
2019-09-10 17:04:09 +02:00
Christophe Battarel
95417d4c86
allow standalone credit note even if no invoice
2019-09-10 16:24:04 +02:00
Laurent Destailleur
61cf47aa16
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-10 00:14:07 +02:00
Laurent Destailleur
1d74387125
Removed deprecated property ->numero (We must use ->num_payment)
2019-09-09 08:47:23 +02:00
Laurent Destailleur
cad9a59d2a
Add option to be able to find behaviour before the fix of list of
...
invoice in direct debit order.
2019-09-06 14:45:55 +02:00
Laurent Destailleur
09d6826e62
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/supplier_order.php
htdocs/langs/en_US/admin.lang
2019-09-06 14:27:01 +02:00
Laurent Destailleur
bc0b8dfad0
FIX Consistency in direct debit order lists.
...
FIX Confirmation of deletion
2019-09-06 14:24:33 +02:00
Laurent Destailleur
bc7bf3b4b5
FIX bad consistency in list of invoice for direct debit order.
2019-09-06 13:44:02 +02:00
Laurent Destailleur
d1a5be20ea
Fix wrong warning
2019-09-06 13:02:52 +02:00
ptibogxiv
5d81b0271d
Update facture.class.php
2019-09-06 11:40:26 +02:00
ptibogxiv
fc75d72290
Update list.php
2019-09-06 11:35:52 +02:00
Laurent Destailleur
529dd05226
Replace deprecated code
2019-09-06 10:53:05 +02:00
Laurent Destailleur
bb81f66a1a
Add phpunit test for Lessc
2019-09-06 10:36:49 +02:00
Laurent Destailleur
92e7d7bb26
Fix duplicate translation
2019-09-05 16:18:20 +02:00
atm-ph
f7fe3d2842
Fix set var in context attribute instead of object attribute
2019-09-04 16:30:55 +02:00
Laurent Destailleur
481a25cb8f
The hook "moreFamily" must return payment into var "totalpayment" and no
...
more "paiement" (english replace french).
2019-09-03 17:39:19 +02:00
Laurent Destailleur
da3d230182
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.stickler.yml
htdocs/takepos/invoice.php
2019-09-03 17:34:49 +02:00
Laurent Destailleur
84800257e8
Merge pull request #11799 from jtraulle/fix-11683-10.0
...
Fix #11682 Missing origin object ref and thirdparty ref in future ban…
2019-09-03 17:32:47 +02:00
Laurent Destailleur
7c07e64adc
Update treso.php
2019-09-03 17:32:18 +02:00
Laurent Destailleur
65fee73b22
Update treso.php
2019-09-03 17:31:20 +02:00
Laurent Destailleur
28c4f86c79
Fix regression
2019-09-03 16:23:39 +02:00
Laurent Destailleur
33cb9f7df4
Merge pull request #11776 from OPEN-DSI/fix-facture-duedate-and-paid
...
FIX set due date in object in create invoice and set default paid in …
2019-09-03 15:21:19 +02:00
Frédéric FRANCE
32343fba24
Optimize invoice situation doc
...
with many many lines, it can be very very long to generate pdf
2019-09-03 13:43:44 +02:00
Laurent Destailleur
98459363df
Merge pull request #11795 from jtraulle/fix-doxygen-examples
...
Fix Wrongly catched examples by Doxygen
2019-09-03 12:45:23 +02:00
Laurent Destailleur
a269082d70
Replace deprecated code with new one
2019-09-02 03:58:00 +02:00
Laurent Destailleur
f2af28f0e1
Clean code
2019-08-31 02:08:26 +02:00
Jean Traullé
8f1fba6775
Fix #11682 Missing origin object ref and thirdparty ref in future bank entries
2019-08-30 23:56:52 +02:00
Jean Traullé
c32c7d48ba
Fix Wrongly catched examples by Doxygen
2019-08-30 17:14:59 +02:00
Laurent Destailleur
05c9e97fe4
The deprecated method get_OutstandingBill has been removed. You can use
...
getOutstandingBills() instead.
2019-08-29 00:45:02 +02:00
VESSILLER
877867a6c2
FIX set due date in object in create invoice and set default paid in update invoice
2019-08-28 13:50:39 +02:00
atm-ph
5aa27a126a
Fix trigger create on widthdraw is missing
2019-08-28 13:45:02 +02:00
Laurent Destailleur
e421b4b698
Trans
2019-08-28 10:12:39 +02:00
Laurent Destailleur
4b5d9e44b2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-26 22:47:33 +02:00
Laurent Destailleur
45ff873064
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/paiement.php
htdocs/core/class/html.form.class.php
2019-08-26 22:44:49 +02:00
Laurent Destailleur
f07d99ed9a
Merge pull request #11730 from atm-ph/fix_9.0_missing_hooks
...
Fix wrong placement to print title and missing hook to print value
2019-08-26 17:14:50 +02:00
Laurent Destailleur
999db7ed41
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/salaries/card.php
htdocs/compta/sociales/class/chargesociales.class.php
htdocs/takepos/invoice.php
2019-08-26 16:49:25 +02:00
Laurent Destailleur
7c5fc9f3f8
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-08-26 16:43:33 +02:00
Laurent Destailleur
c93e6550ce
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/paiement.php
htdocs/compta/sociales/class/chargesociales.class.php
2019-08-26 16:43:24 +02:00
Laurent Destailleur
dcfbba9af5
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/compta/sociales/class/chargesociales.class.php
2019-08-26 16:41:06 +02:00
Laurent Destailleur
60b8982a74
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-08-26 16:39:39 +02:00
Laurent Destailleur
fc1381c056
Merge pull request #11739 from ptibogxiv/patch-239
...
Fix display context for takepos in invoice/list.php
2019-08-26 16:38:27 +02:00
Alexandre SPANGARO
76691925a4
FIX Missing div for buttons in tax, loan, various payment modules
2019-08-26 15:35:20 +02:00
ptibogxiv
7112fcee9a
Update list.php
2019-08-24 15:54:14 +02:00
ptibogxiv
2be125e647
Fix display context for takepos in invoice list
...
fix for thirdparty name and create button
2019-08-24 15:47:17 +02:00
Regis Houssin
064ab389ed
FIX wrong parameters (same error in branch 9, 10, develop)
2019-08-24 12:44:23 +02:00
atm-ph
f14f1c9190
Fix wrong placement to print title and missing hook to print value
2019-08-23 09:15:15 +02:00
Regis Houssin
2d59f6bb3d
FIX avoid sql error if fk_project is empty during update
2019-08-23 07:59:36 +02:00
Laurent Destailleur
3339f89fc5
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/api/class/api_login.class.php
htdocs/dav/fileserver.php
2019-08-22 12:45:23 +02:00
Laurent Destailleur
27cd6cd308
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/paiement.php
htdocs/product/fournisseurs.php
htdocs/stripe/payment.php
2019-08-22 12:39:07 +02:00
Laurent Destailleur
a35f010e55
FIX name and position of hook FIX #11710
2019-08-22 12:30:14 +02:00
Laurent Destailleur
54203dda1f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/modules.php
2019-08-21 16:25:48 +02:00
Laurent Destailleur
def0311f9d
Fix translation
2019-08-19 17:26:13 +02:00
Laurent Destailleur
d304749eca
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-19 10:19:14 +02:00
Laurent Destailleur
21fc089f58
FIX Translation of month
2019-08-19 10:18:38 +02:00
Laurent Destailleur
6abfd8b145
Fix use short labels for workboard
2019-08-19 10:01:42 +02:00
Laurent Destailleur
71be9f5b3f
Fix test on terminal for 'cashdesk' module
2019-08-18 21:01:17 +02:00
Laurent Destailleur
c989a63360
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/langs/en_US/cashdesk.lang
2019-08-18 20:54:06 +02:00
Laurent Destailleur
783e01588c
FIX It was possible to create cashfence without entering data.
2019-08-18 20:47:40 +02:00
andreubisquerra
bbc1dfb0f7
Cashcontrol TakePOS fixes
2019-08-18 20:40:31 +02:00
Laurent Destailleur
f39e8ef835
Merge pull request #11703 from andreubisquerra/master
...
Cashcontrol TakePOS fixes
2019-08-18 20:39:57 +02:00
Laurent Destailleur
f27bea9497
Fix phpcs
2019-08-18 20:39:02 +02:00
Laurent Destailleur
ad5f2dbe9d
Fix update on id
2019-08-18 18:56:58 +02:00
Laurent Destailleur
8cf0671804
FIX Missing transaction
2019-08-18 18:56:21 +02:00
andreubisquerra
063f19fe67
Cashcontrol TakePOS fixes
2019-08-18 09:33:02 +02:00
Laurent Destailleur
5351d78a96
Merge branch 'develop' into develop_new_dashboard
2019-08-18 01:26:56 +02:00
Jean Traullé
e0310b5d9b
Fix #11682 Missing origin object ref and thirdparty ref in future bank entries
2019-08-16 11:38:42 +02:00
Laurent Destailleur
6430c74793
Merge pull request #11168 from hregis/develop_menu
...
NEW add new function "setEntity()" and better compatibility with Multicompany
2019-08-15 21:00:05 +02:00
Laurent Destailleur
c1d54a7711
Merge pull request #11652 from prietojc/patch-6
...
FIX: Update() in charge sociales
2019-08-15 19:35:27 +02:00
Laurent Destailleur
4a083bb038
Update chargesociales.class.php
2019-08-15 19:35:05 +02:00
Jean Traullé
6edf5494c3
Added @throws annotations for possible exceptions
2019-08-15 15:29:37 +02:00
Jean Traullé
f37b8c78c8
NEW Add POST /bankaccounts/transfer REST API endpoint.
...
This allow internal transfers between two bankaccounts.
2019-08-15 15:18:09 +02:00
Regis Houssin
7c8b3c9a38
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-08-13 07:34:02 +02:00
JC Prieto
d00f3c9685
Update chargesociales.class.php
2019-08-12 20:07:24 +02:00
JC Prieto
0e9898041e
Setting NULL if not project
2019-08-12 09:45:47 +02:00
Laurent Destailleur
14fabeb377
Variable rangtouse -> ranktouse
2019-08-10 00:46:20 +02:00
Frédéric FRANCE
aa462bac23
Add empty index.html
2019-08-09 09:25:48 +02:00
JC Prieto
faf65f39b6
FIX: Update() function checking
...
If module Project is off, shows an error.
2019-08-06 19:14:56 +02:00
John Botella
b4c4e5a662
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard
2019-08-02 14:52:01 +02:00
Laurent Destailleur
3d8f6dca76
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-01 16:30:32 +02:00
Laurent Destailleur
6693f9fbca
Fix phpcs
2019-08-01 16:24:19 +02:00
Laurent Destailleur
d7a41c6b72
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
2019-08-01 12:54:27 +02:00
John Botella
9b84987cc1
prepare new dashboard
2019-08-01 12:33:19 +02:00
Laurent Destailleur
5eb8f05061
FIX #11584
2019-08-01 12:23:02 +02:00
Regis Houssin
d9ea61e47c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop_menu
Conflicts:
htdocs/commande/class/commande.class.php
2019-07-31 12:49:56 +02:00
Laurent Destailleur
a7390e7e47
Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop
...
NEW Management of retained warranty on situation invoices
2019-07-30 21:53:09 +02:00
Laurent Destailleur
dca775985f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-30 20:55:41 +02:00
Laurent Destailleur
34f78c555d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-30 20:55:35 +02:00
Laurent Destailleur
192fb45ce7
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/accountancy/bookkeeping/card.php
htdocs/accountancy/bookkeeping/list.php
htdocs/adherents/card.php
htdocs/compta/sociales/list.php
htdocs/compta/sociales/payments.php
htdocs/core/modules/import/import_csv.modules.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/holiday/class/holiday.class.php
htdocs/viewimage.php
2019-07-30 20:55:15 +02:00
Laurent Destailleur
5cbde99871
Merge pull request #11579 from atm-maxime/new_withdraw_date_rum
...
NEW Can edit date or RUM mandate
2019-07-30 16:04:57 +02:00
ptibogxiv
5b1a89bf94
Fix php error with const
2019-07-30 15:42:37 +02:00
ptibogxiv
5880d549fb
Fix php error with const
2019-07-30 11:55:46 +02:00
Laurent Destailleur
11e3aa5860
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-29 11:07:11 +02:00
Laurent Destailleur
7931f0b422
Fix sql error
2019-07-29 11:06:39 +02:00
Laurent Destailleur
a5e3adc6f1
Fix travis
2019-07-29 10:51:17 +02:00
Laurent Destailleur
db461792a0
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-29 01:36:35 +02:00
Laurent Destailleur
9a7113f4f5
FIX Update the file index table when we validate/rename a ref.
2019-07-28 22:26:55 +02:00
Maxime Kohlhaas
3cc2c91e31
Use date_rum if defined
2019-07-28 22:26:19 +02:00
atm-quentin
f7c739bba9
FIX wrong path sociales/index.php doesnt exist anymore
2019-07-26 12:12:08 +02:00
Laurent Destailleur
a46bfc7a29
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/project.lib.php
2019-07-25 17:54:14 +02:00
Laurent Destailleur
2dc2af7c41
Merge pull request #11552 from aspangaro/10.0_FEC
...
Presentation nowrap on amount
2019-07-25 17:35:36 +02:00
Alexandre SPANGARO
3921f706e2
Presentation nowrap on amount
2019-07-24 09:01:11 +02:00
Laurent Destailleur
8aaa716e33
Fix missing title
2019-07-23 13:05:33 +02:00
Laurent Destailleur
a61fdc5a3c
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-23 00:25:10 +02:00
Laurent Destailleur
a33ac665bb
Fix phpcs
2019-07-22 22:07:04 +02:00
Laurent Destailleur
bef3423764
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
2019-07-22 19:12:27 +02:00
Laurent Destailleur
9f95b10d0e
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/comm/action/list.php
htdocs/comm/action/peruser.php
htdocs/compta/prelevement/card.php
htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
2019-07-22 19:11:27 +02:00
Laurent Destailleur
4833c2bf49
Merge
2019-07-22 18:50:17 +02:00
Laurent Destailleur
f5afc50067
Merge branch '11.0_salaries' of https://github.com/aspangaro/dolibarr into aspangaro-11.0_salaries
2019-07-22 18:47:35 +02:00
Laurent Destailleur
a379d7804c
Merge pull request #11535 from aspangaro/11.0_p1
...
QUAL Move ligne.php to line.php
2019-07-22 18:33:06 +02:00
Laurent Destailleur
cf87196f37
Fix css
2019-07-21 20:55:12 +02:00
Laurent Destailleur
d6d1b29257
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-21 16:15:32 +02:00
Laurent Destailleur
4f34a8b6e8
FIX Position was lost when we edit the line of template invoice
2019-07-21 16:15:13 +02:00
Laurent Destailleur
f368ef377b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/societe/class/societe.class.php
2019-07-20 16:02:15 +02:00
Laurent Destailleur
f6c937a218
Fix translation
2019-07-20 14:14:18 +02:00
Laurent Destailleur
0dcd38b96f
Fix decimals
2019-07-20 14:09:42 +02:00
Laurent Destailleur
865ebb9de2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/ticket/class/ticket.class.php
2019-07-20 13:29:10 +02:00
Alexandre SPANGARO
5f042cf6ad
QUAL Move ligne.php to line.php
2019-07-19 23:19:06 +02:00
Alexandre SPANGARO
0af1206892
Merge branch 'develop' into 11.0_salaries
2019-07-19 23:11:06 +02:00
Alexandre SPANGARO
9ab0734415
NEW Extrafields on salaries
2019-07-19 23:08:24 +02:00
Laurent Destailleur
e5c3945ec3
FIX delete of links between objects
2019-07-19 18:10:45 +02:00
Laurent Destailleur
14751680d2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-19 13:38:05 +02:00
Laurent Destailleur
2e08c02510
Better error management
2019-07-19 13:37:28 +02:00
Laurent Destailleur
f745d01bf3
Prepare change of properties "titre" into "title"
2019-07-19 13:22:54 +02:00
atm-ph
a03bb00254
Fix missing hook
2019-07-19 11:26:21 +02:00
Regis Houssin
cbda42d146
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-07-19 09:37:34 +02:00
Laurent Destailleur
e5801c0b68
Update bonprelevement.class.php
2019-07-19 04:06:22 +02:00
Laurent Destailleur
50480bf517
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/opensurvey/index.php
2019-07-18 18:23:24 +02:00
Laurent Destailleur
3cffd70ed3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/prelevement/create.php
htdocs/core/class/commonobject.class.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/commande/dispatch.php
htdocs/fourn/product/list.php
htdocs/opensurvey/index.php
htdocs/ticket/index.php
htdocs/ticket/list.php
2019-07-18 18:09:37 +02:00
atm-ph
fcd95ce073
Fix missing trigger call
2019-07-18 18:07:17 +02:00
Laurent Destailleur
b3182f65bc
Update create.php
2019-07-18 17:23:52 +02:00
Laurent Destailleur
e548872133
Update prelevement.php
2019-07-18 17:23:05 +02:00
atm-ph
984fe98342
Fix missing hook
2019-07-18 16:12:42 +02:00
atm-ph
c961a397c4
Fix missing hook then can't interact with actions
2019-07-18 15:40:50 +02:00
Laurent Destailleur
2c0c5a505f
Merge pull request #11351 from rycks/tvaPrint
...
Update print VAT document: remove form part and add right title
2019-07-16 17:18:07 +03:00
Laurent Destailleur
b9771db131
Fix phpcs
2019-07-16 17:16:49 +03:00
Laurent Destailleur
adfbd62f8b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-14 00:44:35 +02:00
Laurent Destailleur
e0095871aa
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/stats/byratecountry.php
htdocs/core/class/html.form.class.php
2019-07-14 00:19:56 +02:00
Laurent Destailleur
3bfc1938d3
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2019-07-14 00:13:16 +02:00
Laurent Destailleur
b66ad24d85
Fix save of doc template for recuring invoices.
2019-07-14 00:10:15 +02:00
Laurent Destailleur
39e77dbdc6
Merge pull request #11461 from ATM-Nicolas/fix_template_invoice_edit_modelpdf
...
FIX : We must save code instead of value in database…
2019-07-14 00:19:13 +03:00
Laurent Destailleur
b6571d9fc3
Update byratecountry.php
2019-07-13 22:39:25 +02:00
gauthier
cce8f98afc
FIX : accounting mode must be taken from global conf, because there's no way to choose a mode with interface
2019-07-10 16:33:03 +02:00
Maxime Kohlhaas
0aa42fefae
Fix : use RUM if defined in bank account
2019-07-09 18:13:11 +02:00
Laurent Destailleur
f5cc29417d
Translation lignes -> lines
2019-07-05 21:50:35 +02:00
Laurent Destailleur
0a7d70829f
Translation of some comments
2019-07-05 21:37:25 +02:00
Laurent Destailleur
ee109ac568
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-05 17:44:50 +02:00
Laurent Destailleur
675b7b2e32
Fix link to reconcile
2019-07-05 13:11:30 +02:00
Laurent Destailleur
575dce2dff
Fix css
2019-07-05 12:17:36 +02:00
ATM-Nicolas
3d076d8bf9
FIX : We must save code instead of value in database for template invoice modelpdf
2019-07-05 11:16:12 +02:00
Laurent Destailleur
2fee41f712
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-04 12:27:00 +02:00
Laurent Destailleur
69e0353e12
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-07-04 12:26:26 +02:00
Laurent Destailleur
8e3620fce1
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/facture/invoicetemplate_list.php
2019-07-04 12:26:17 +02:00
Laurent Destailleur
ee0a65e7fa
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/comm/action/card.php
2019-07-04 12:22:40 +02:00
Laurent Destailleur
bc309ace38
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-07-04 12:21:16 +02:00
Louis Sautier
818a8c7d59
Fix missing form end tag in prelevement
2019-07-03 10:46:32 +02:00
Alexandre SPANGARO
ab7cb7bb2e
FIX Nowrap on amount
2019-07-02 12:01:50 +02:00
Maxime Kohlhaas
6b43c325c7
Fix wrong column for filters on invoice template list
2019-07-02 10:53:47 +02:00
John Botella
9c2e83dcae
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-07-01 09:51:26 +02:00
Laurent Destailleur
8919eaebab
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-29 23:27:15 +02:00
Laurent Destailleur
2cefe638ef
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/compta/prelevement/factures.php
2019-06-29 23:24:04 +02:00
Laurent Destailleur
81bb85c4df
Merge
2019-06-29 23:19:47 +02:00
Laurent Destailleur
adb3062a9f
Work on nblignes -> nblines
2019-06-29 16:38:14 +02:00
John Botella
75b55ac5d6
fix travis recommendations
2019-06-28 16:10:41 +02:00
Laurent Destailleur
854bbf8405
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-06-28 14:09:00 +02:00
Laurent Destailleur
c0ba22fc6c
Merge pull request #11406 from ptibogxiv/patch-194
...
NEW Can load multilang translation in same step than fetch_lines
2019-06-28 14:04:06 +02:00
Maxime Kohlhaas
fc1d4704a5
Fix invoice list filter on withdrawal card
2019-06-27 17:33:47 +02:00
Laurent Destailleur
6136dd6e7c
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-27 13:57:08 +02:00
Laurent Destailleur
8c6485fa20
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
ChangeLog
htdocs/compta/facture/card.php
2019-06-27 13:56:33 +02:00
Laurent Destailleur
d69b20311b
FIX If the replacement invoice has been deleted we can reopen
2019-06-27 01:13:46 +02:00
Laurent Destailleur
be695a8e1a
Fix link for situations
2019-06-27 00:51:03 +02:00
John Botella
ee98f3e6d7
fix travis recommendations
2019-06-26 10:48:22 +02:00
John Botella
7e14a598e2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-26 09:43:43 +02:00
ptibogxiv
c81ffcd8f0
Update facture.class.php
2019-06-25 18:14:56 +02:00
ptibogxiv
66eec4da52
Update facture.class.php
2019-06-25 15:46:12 +02:00
Laurent Destailleur
fa476b4994
Properties ->libelle_incoterms were renamed into ->label_incoterms
2019-06-25 13:00:02 +02:00
Laurent Destailleur
d810e11c4e
Update fiche-rec.php
2019-06-24 19:23:32 +02:00
John Botella
ec7446762c
Fix travis
2019-06-24 14:36:06 +02:00
Laurent Destailleur
1daac232b0
Code comment
2019-06-24 14:31:58 +02:00
John Botella
a83e7f3665
Add retained warranty to PDF
2019-06-24 12:00:55 +02:00
John Botella
7b6925b8f7
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-24 10:29:43 +02:00
Laurent Destailleur
5675e7c50e
Clean code of deprecated method
2019-06-22 18:19:40 +02:00
Laurent Destailleur
8da5794777
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/accounting.lib.php
htdocs/product/stock/class/entrepot.class.php
2019-06-20 18:24:43 +02:00
Laurent Destailleur
d47cf87c00
Look and feel v10
2019-06-20 17:59:28 +02:00
Laurent Destailleur
c521b9b8f8
Fix dispatch in ledger table of withdraw / direct debit payment
2019-06-20 16:58:51 +02:00
Laurent Destailleur
4f9aa4caac
Fix phpcs
2019-06-20 13:53:31 +02:00
Laurent Destailleur
4ffa48d9bd
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-20 13:50:47 +02:00
Laurent Destailleur
afb6362317
Fix look and feel v10
...
Fix link to direct debit payment order
2019-06-20 13:37:06 +02:00
Laurent Destailleur
d15a300f02
Removed not used var
2019-06-20 04:10:58 +02:00
Laurent Destailleur
a264a4766a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-20 03:45:04 +02:00
Laurent Destailleur
898d766489
Merge pull request #11354 from rycks/allowZeroAsAccountNumber
...
Allow zero as account number
2019-06-20 03:09:37 +02:00
Laurent Destailleur
4308f48cad
Merge branch 'develop' into MissingHook
2019-06-20 03:04:32 +02:00
Laurent Destailleur
925314c710
Merge pull request #11367 from aspangaro/10.0_other3
...
Nowrap on amount
2019-06-20 02:51:14 +02:00
Laurent Destailleur
e060af5c97
Update treso.php
2019-06-20 02:50:23 +02:00
Laurent Destailleur
daa8b43732
css
2019-06-19 15:51:48 +02:00
Laurent Destailleur
a11c816a17
Fix tooltip
2019-06-19 14:24:48 +02:00
Alexandre SPANGARO
9a32117b1d
Nowrap on amount
2019-06-19 08:43:57 +02:00
Nicolas ZABOURI
2e4db8c83c
Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook
2019-06-19 08:39:05 +02:00
Alexandre SPANGARO
a849fbe42e
Nowrap on amount
2019-06-19 07:15:52 +02:00
Laurent Destailleur
f3703c8805
Fix phpcs
2019-06-18 18:07:47 +02:00
Laurent Destailleur
2e1eb29ca0
Fix rendering of amount
2019-06-18 17:43:08 +02:00
Laurent Destailleur
27f52dd0bd
Fix columns in csv
2019-06-18 14:32:35 +02:00
Laurent Destailleur
ad20a5158c
Fix columns in csv
2019-06-18 14:32:28 +02:00
Laurent Destailleur
8835b49f3f
Debug the accounting-file tool
2019-06-18 14:30:13 +02:00
ICstage
820c420ae5
FIX Missing hooks
2019-06-18 14:07:52 +02:00
Eric Seigne
0b3bc5a172
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into allowZeroAsAccountNumber
2019-06-17 18:30:11 +02:00
Eric Seigne
80d4d8754d
allow zero as accountancy code nomber (replace all empty tests by != '')
2019-06-17 18:28:11 +02:00
Laurent Destailleur
08d5ca4ddb
Debug page to export accounting documents
2019-06-17 17:53:43 +02:00
Laurent Destailleur
2fab35c287
Debug page to export file
2019-06-17 17:20:22 +02:00
Laurent Destailleur
a74eaaff4d
Fix sort of linked elements
2019-06-17 15:54:54 +02:00
Eric Seigne
71d984483d
Update print VAT document: remove form part and add right title
2019-06-17 14:45:49 +02:00
Regis Houssin
6597c9f60d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-06-17 06:45:08 +02:00
Laurent Destailleur
a7e0589071
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-12 13:59:22 +02:00
Laurent Destailleur
c57013f293
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-12 13:59:14 +02:00
Laurent Destailleur
3ad36a51db
Merge pull request #11312 from aspangaro/10.0_b1
...
Look and feel v10
2019-06-12 13:11:27 +02:00
Laurent Destailleur
475f59cc2a
Update annuel.php
2019-06-12 13:10:17 +02:00
Laurent Destailleur
9d95812495
Update bankentries_list.php
2019-06-12 13:08:26 +02:00
Laurent Destailleur
509ca489b2
Update card.php
2019-06-12 13:06:02 +02:00
Alexandre SPANGARO
eb4dc36e05
Responsive on invoice index
2019-06-12 04:56:16 +02:00
Alexandre SPANGARO
f3cba86282
Better look
2019-06-10 07:49:10 +02:00
Alexandre SPANGARO
6d43efb4a2
Align right
2019-06-09 16:35:45 +02:00
Alexandre SPANGARO
8c5a01dd90
Show total with decimals
2019-06-09 08:56:49 +02:00
Alexandre SPANGARO
33b02b97d5
Better look
2019-06-09 08:50:20 +02:00
Alexandre SPANGARO
ae686ff62a
Better look
2019-06-09 08:39:38 +02:00
Laurent Destailleur
1b77d2f10b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-07 22:56:58 +02:00
Laurent Destailleur
f713deb0a8
Fix sql syntax error
2019-06-07 22:55:51 +02:00
Laurent Destailleur
0099c1f602
Fix missing date
2019-06-07 22:55:18 +02:00
Laurent Destailleur
49646663a1
Fix link on invoice
2019-06-07 22:47:15 +02:00
Laurent Destailleur
e3812e3b0c
FIX source template invoice not loaded/shown
2019-06-05 08:20:10 +02:00
Laurent Destailleur
c200ec22da
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2019-06-05 08:17:28 +02:00
Laurent Destailleur
5451d72900
FIX source template invoice not loaded/shown
2019-06-05 08:08:31 +02:00
Laurent Destailleur
4a63c6d38a
Fix phpcs
2019-06-04 19:20:08 +02:00
Laurent Destailleur
21a1e0d7b3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/categories/index.php
htdocs/comm/action/list.php
htdocs/comm/action/rapport/index.php
htdocs/compta/paiement.php
htdocs/compta/sociales/document.php
htdocs/compta/tva/document.php
htdocs/core/actions_massactions.inc.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/facture/paiement.php
htdocs/loan/document.php
htdocs/main.inc.php
2019-06-04 19:03:27 +02:00
John BOTELLA
d7a393bbd3
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-04 14:00:18 +02:00
Laurent Destailleur
969e139d5c
Fix parameters of accessforbidden
2019-06-04 12:21:27 +02:00
Laurent Destailleur
2c04a480a2
Fix phpcs
2019-06-04 02:31:19 +02:00
Laurent Destailleur
ba2b07917b
Fix look and feel v10
2019-06-04 02:11:03 +02:00
Regis Houssin
fc83585574
FIX use setEntity() to move code in multicompany module
2019-06-03 11:37:04 +02:00
Regis Houssin
7b8b1a9052
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-06-03 11:04:28 +02:00
Laurent Destailleur
57cfb4b007
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/class/website.class.php
2019-06-02 12:36:07 +02:00
Laurent Destailleur
a1a9313487
Merge pull request #11292 from atm-maxime/fix_invoice_from_contract2
...
Fix : only invoice active lines of a contract
2019-06-02 12:29:13 +02:00
Laurent Destailleur
4bbef9b478
Update card.php
2019-06-02 12:29:05 +02:00
Laurent Destailleur
7020e1ef29
Update card.php
2019-06-02 12:27:32 +02:00
Maxime Kohlhaas
916d3ce931
Fix : only invoice active lines of a contract
2019-06-02 11:00:58 +02:00
Maxime Kohlhaas
6dd01e86e9
Fix : avoid warning and uniformize var use
2019-05-31 15:53:23 +02:00
Laurent Destailleur
03feb3604c
Merge pull request #11265 from frederic34/patch-2
...
Update tpl linked invoices
2019-05-29 13:54:09 +02:00
Laurent Destailleur
bc030561ac
Debug various payment
2019-05-29 13:48:00 +02:00
Laurent Destailleur
280a034199
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-05-29 13:15:57 +02:00
Laurent Destailleur
a7dccf1617
Merge pull request #11255 from aspangaro/10.0_accountancy2
...
FIX Lost functionnality - Add category to bank transaction with various payment
2019-05-29 13:15:47 +02:00
Laurent Destailleur
cafb3840b7
Fix look and feel v10
2019-05-29 12:56:11 +02:00
Laurent Destailleur
6a84dfe29e
Update card.php
2019-05-29 12:34:54 +02:00
Frédéric FRANCE
6bb1a4a0e6
Update linkedobjectblock.tpl.php
2019-05-29 11:26:04 +02:00
Frédéric FRANCE
c5c7e8d451
Update linkedobjectblock.tpl.php
2019-05-29 11:18:01 +02:00
Laurent Destailleur
2218994958
FIX Duplicate encoding on error message
2019-05-29 09:51:45 +02:00
Laurent Destailleur
848b8f9bc4
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/cron/cron_run_jobs.php
htdocs/public/payment/newpayment.php
scripts/cron/cron_run_jobs.php
2019-05-27 19:01:28 +02:00
Laurent Destailleur
71da27f333
Add error message
2019-05-27 16:40:06 +02:00
Alexandre SPANGARO
19b275f2d1
Fix bankline cat with various payment
2019-05-26 22:33:35 +02:00
Laurent Destailleur
b81c3a6d2b
Fix look and feel v10
2019-05-26 18:23:30 +02:00
Alexandre SPANGARO
ea13657617
Merge remote-tracking branch 'upstream/develop' into 10.0_accountancy2
2019-05-26 14:23:47 +02:00
Laurent Destailleur
19ff0120ff
# WARNING: head commit changed in the meantime
...
Removed uselesss files (replaced by DebugBar)
2019-05-26 11:42:00 +02:00
Laurent Destailleur
a40e5ca66c
Fix phpcs
2019-05-26 11:36:16 +02:00
Laurent Destailleur
ccfb4f575b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2019-05-24 15:00:14 +02:00
Laurent Destailleur
89455672a2
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2019-05-24 14:58:21 +02:00
Laurent Destailleur
18f1952e2d
Fix set of properties
2019-05-22 14:49:18 +02:00
Marc de Lima Lucio
54f8c98b27
FIX: remove isolated transaction commit
2019-05-22 11:12:02 +02:00
Marc de Lima Lucio
66dd7e30ae
FIX: situation invoices: block progress percentage change for discount lines
2019-05-22 10:46:38 +02:00
Regis Houssin
4f2f23f522
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-05-22 08:45:31 +02:00
Laurent Destailleur
22e897b1a1
Clean and prepare code to fix a SQL injection
2019-05-21 17:22:38 +02:00
Laurent Destailleur
6365c7cd00
Bad cut and paste
2019-05-21 12:17:07 +02:00
Regis Houssin
2cf630c213
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-05-20 16:10:47 +02:00
Laurent Destailleur
321544b3fa
Fix phpcs
2019-05-20 15:25:39 +02:00
Laurent Destailleur
c3732f2b7a
Fix edition of margins in recurring invoices
2019-05-20 14:41:47 +02:00
Laurent Destailleur
83c369cc0f
Add $array_to_check for property in invoice instead of thirdparty
2019-05-20 13:02:33 +02:00
Laurent Destailleur
91dd8a71d3
Fix syntax error
2019-05-20 12:50:00 +02:00
Laurent Destailleur
827a2e1809
Fix test if qualified for stock change at wrong place
2019-05-20 12:47:02 +02:00
Laurent Destailleur
5f23cf7e2a
CSS
2019-05-19 13:51:47 +02:00
Laurent Destailleur
2bbb04085e
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/modulebuilder/template/class/myobject.class.php
2019-05-19 02:15:01 +02:00
Laurent Destailleur
71ef8c881b
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
...
Conflicts:
htdocs/modulebuilder/template/class/myobject.class.php
2019-05-19 02:06:20 +02:00
Laurent Destailleur
2fd3eb8bdf
Update facture.class.php
2019-05-19 01:58:01 +02:00
florian HENRY
7f8c118466
fix : #11015
2019-05-19 01:52:50 +02:00
ATM-Marc
83c38570e9
FIX: invoice class: bad SQL request if product type not set
2019-05-19 01:01:21 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
...
NEW : look and feel title button
2019-05-18 16:04:47 +02:00
Laurent Destailleur
26d4875f8f
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop
2019-05-18 02:27:23 +02:00
Laurent Destailleur
68118e55dc
Update api_invoices.class.php
2019-05-18 00:58:43 +02:00
Maxime Kohlhaas
1af69d4c8f
Fix varnames in invoice api
2019-05-18 00:40:29 +02:00
Laurent Destailleur
c1ec7454a1
Merge branch 'develop' into clean_10_beta
2019-05-16 21:21:51 +02:00
Laurent Destailleur
9f8f45d5bc
FIX Payment on supplier invoice should not mix credit note and standard
...
invoices.
2019-05-14 12:00:58 +02:00
Francis Appels
a2d4a59321
Merge branch 'develop' into clean_10_beta
2019-05-13 21:27:13 +02:00
Regis Houssin
62489d1f5e
FIX replace "dir_output" with "multidir_output"
2019-05-12 14:41:30 +02:00
Regis Houssin
b73df2698d
FIX better compatibility with Multicompany
2019-05-12 14:25:41 +02:00
Laurent Destailleur
aaeb7dc9d6
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/holiday.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/filefunc.inc.php
htdocs/product/list.php
2019-05-10 17:45:33 +02:00
John BOTELLA
f296093f8d
fix travis
2019-05-10 15:52:46 +02:00
Laurent Destailleur
9de0e69456
FIX column project into list
2019-05-10 15:11:06 +02:00
Laurent Destailleur
5625c94c44
Fix missing label on project tooltip
2019-05-10 14:40:15 +02:00
Laurent Destailleur
0e8184332e
Fix missing label on project tooltip
2019-05-10 14:39:05 +02:00
Laurent Destailleur
6cb96b926b
Fix phpcs
2019-05-09 21:34:22 +02:00
Laurent Destailleur
78c4a3cced
Fix lang
2019-05-09 18:33:50 +02:00
Laurent Destailleur
a94c291b76
Dolibarization
2019-05-09 16:59:06 +02:00
Laurent Destailleur
3bf162dcd6
Clean code for v10
2019-05-09 14:36:48 +02:00
Laurent Destailleur
74875690a0
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/tpl/massactions_pre.tpl.php
2019-05-08 19:14:31 +02:00
Laurent Destailleur
f6de2d091d
FIX Sending email to mass actions send same email on same customer
2019-05-08 19:07:12 +02:00
Laurent Destailleur
1e036f3513
Correct support for type price on module builder
...
Fix link of ref in cash fence list
2019-05-08 01:09:38 +02:00
Francis Appels
03e2983d40
Merge branch 'develop' into clean_10_beta
2019-05-06 15:22:27 +02:00
ptibogxiv
c94e621059
FIX : facnumber to ref report takepos
2019-05-04 17:23:57 +02:00
Laurent Destailleur
64fb7bd1c2
Merge pull request #11103 from grandoc/new_branch_02_05_2019
...
inactive a var_dump
2019-05-03 02:29:25 +02:00
Philippe GRAND
bcd96ba8d6
inactive a var_dump
2019-05-02 14:42:02 +02:00
Laurent Destailleur
4f9ea912ab
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/website.inc.php
2019-05-02 14:41:56 +02:00
Laurent Destailleur
e2c7c0574e
Merge pull request #11086 from andreubisquerra/master
...
NEW Add history to view and print previous sales on TakePos.
2019-05-02 14:04:57 +02:00
Ferran Marcet
be17e31be1
New: Add ref_client field on template invoice
2019-05-02 11:04:55 +02:00
Francis Appels
18c5c586ab
Cleanup set_draft in syslog
2019-05-01 09:38:27 +02:00
Laurent Destailleur
9c45b781af
Fix balance of colspan
2019-04-30 16:44:11 +02:00
Laurent Destailleur
2136bce4b0
FIX missing situation invoice in list
2019-04-30 15:10:38 +02:00
andreubisquerra
00db274956
Add history to view and print previous sales.
2019-04-28 18:12:33 +02:00
Ferran Marcet
7a651b5071
New: Add ref_client field on template invoice
2019-04-26 13:53:22 +02:00
Laurent Destailleur
091132de2f
Signatures of methods createFromClone() has been standardized. All
...
methods requires the object User as first parameter.
2019-04-25 12:11:32 +02:00
Alexandre SPANGARO
9210a39f6a
Merge branch 'develop' into 10.0_accountancy2
2019-04-24 21:49:41 +02:00
Laurent Destailleur
3b04d2fe9b
Fix warnings
2019-04-23 13:21:17 +02:00
Laurent Destailleur
7f4b09c482
Fix warnings
2019-04-23 13:20:44 +02:00
Laurent Destailleur
4d92d7731c
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/sendings.lib.php
htdocs/langs/en_US/admin.lang
htdocs/theme/eldy/style.css.php
2019-04-23 12:32:08 +02:00
Laurent Destailleur
84ec39f043
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-04-23 12:25:53 +02:00
Laurent Destailleur
6da42941a8
NEW Add attached document on bank account visible in automatic ECM.
2019-04-21 19:54:30 +02:00
Laurent Destailleur
74ba9f57f1
Fix phpcs
2019-04-19 18:48:00 +02:00
John BOTELLA
0855d84ccf
FIX error messages not displayed
2019-04-18 10:40:34 +02:00
atm-quentin
cb7f9c2b6f
NEW filter by thirdparty on report CA by prod/serv
2019-04-17 14:35:46 +02:00
Laurent Destailleur
e6ffaeefe5
CSS
2019-04-17 10:39:30 +02:00
Laurent Destailleur
212b058f46
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2019-04-17 01:18:46 +02:00
Laurent Destailleur
8310e09786
Fix td balance
2019-04-17 01:18:02 +02:00
John BOTELLA
a60d4b3b52
Appli btn apply to links
2019-04-16 09:09:25 +02:00
John BOTELLA
7372e8c610
Appli function to links
2019-04-15 15:47:36 +02:00
Philippe GRAND
728381e6e6
FIX : bug #11018
2019-04-15 15:10:44 +02:00
ATM john
292d9c38a5
Appli function to links
2019-04-15 00:21:58 +02:00
Laurent Destailleur
76567b1d07
NEW Can filter on the date of period for social contributions
2019-04-12 12:51:48 +02:00
Laurent Destailleur
cf058e7d3b
NEW Ask date of invoice when using the Clone feature.
2019-04-12 12:12:08 +02:00
ATM john
bc4db54722
add more class
2019-04-11 21:29:01 +02:00
ATM john
3390ba0e77
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_look_and_feel_title_button
2019-04-11 21:16:42 +02:00
Laurent Destailleur
8079a389f8
Merge pull request #10992 from altatof/faccard2
...
NEW : retrieve invoice infos from order when billing shipment
2019-04-11 16:34:42 +02:00
Laurent Destailleur
f2fd07d824
Merge pull request #10991 from altatof/faccard
...
NEW constant KEEP_DISCOUNT_LINES_FROM_ORIGIN
2019-04-11 16:31:37 +02:00
Laurent Destailleur
4f87018c33
Update card.php
2019-04-11 16:31:13 +02:00
ATM john
29b31bd7ab
New title button first step
2019-04-11 00:38:44 +02:00
Christophe Battarel
46e398f3d3
NEW : retrieve invoice infos from order when billing shipment
2019-04-10 10:50:01 +02:00
Christophe Battarel
b04296984d
NEW constant KEEP_DISCOUNT_LINES_FROM_ORIGIN
2019-04-10 10:29:17 +02:00
Christophe Battarel
5f9f615e11
fix form_conditions_reglement parameters
2019-04-09 18:37:36 +02:00
Christophe Battarel
790c5f493a
fix select_conditions parameters
2019-04-09 18:32:00 +02:00
Christophe Battarel
01255602d8
fix select_conditions parameters
2019-04-09 18:30:58 +02:00
Christophe Battarel
5382ad207f
NEW : add payment terms to invoices list
2019-04-09 18:26:00 +02:00
Laurent Destailleur
d7f980fda0
NEW Add picto of deletion on mass action combo lists
2019-04-09 01:22:59 +02:00
Laurent Destailleur
7b01e76d2b
Fix doxygen
2019-04-08 16:04:15 +02:00
Laurent Destailleur
1274d71a10
Fix phpcs
2019-04-08 16:00:01 +02:00
Laurent Destailleur
2047ad62c5
Merge pull request #10979 from fpeyraud/develop
...
Fix redirection on social tax deletion
2019-04-08 13:58:07 +02:00
Florent Peyraud
7672fd7cf0
Fix redirection on social tax deletion
2019-04-08 09:05:51 +02:00
Dan Rusu
4597e78a9d
Re synchronized the UI action button "Mark as credit available" with API
...
At some point we will need to move this code into common location (maybe facture.class.php) and call as function from both places
2019-04-06 20:10:11 +03:00
Laurent Destailleur
bb9cd05ea8
Fix phpcs
2019-04-02 20:02:43 +02:00
Laurent Destailleur
42fda54edf
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/fichinter/list.php
htdocs/product/stock/replenish.php
2019-04-02 19:41:58 +02:00
Laurent Destailleur
c5348be337
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-04-02 19:35:42 +02:00
Laurent Destailleur
17a61b3232
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-04-02 19:34:49 +02:00
Laurent Destailleur
37b8796f3c
NEW Add line total on list of payments
2019-04-02 17:54:34 +02:00
Laurent Destailleur
8fe1be1a67
Removed deprecated use of string in dol_print_date(). Only date allowed.
2019-04-01 19:27:34 +02:00
Laurent Destailleur
143cbba09b
Update card.php
2019-03-31 18:49:38 +02:00
Laurent Destailleur
ec9fdc1321
Fix regression with class="right". Style of amount lost.
2019-03-31 11:25:29 +02:00
Alexandre SPANGARO
5588fe5b81
FIX: Don't show journal:getNomUrl without data
...
ErrorBadValueForParamNotAString
2019-03-30 09:42:13 +01:00
Laurent Destailleur
5e23c4c03c
Fix self: not defined in a page
2019-03-29 16:23:55 +01:00
Laurent Destailleur
1b2826f476
Look and feel v10
2019-03-29 13:26:26 +01:00
Laurent Destailleur
11e4411400
TakePOS Can enter payment in several times and with different modes
2019-03-27 15:42:53 +01:00
Laurent Destailleur
a34f4c2806
Merge pull request #10909 from IonAgorria/fix-line-dates
...
FIX: Disallow line start date after end date
2019-03-26 19:43:11 +01:00
Laurent Destailleur
f27f65e8bf
Responsive
2019-03-25 10:09:02 +01:00
Laurent Destailleur
1409d1a2c8
Fix phpcs
2019-03-24 19:52:48 +01:00
Laurent Destailleur
89b7f1a040
Fix phpcs
2019-03-24 19:52:18 +01:00
Laurent Destailleur
3578c7cb0a
Fix phpcs
2019-03-24 18:20:56 +01:00
Laurent Destailleur
364deb1476
Fix phpcs
2019-03-24 16:09:48 +01:00
Laurent Destailleur
28abf5663b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/tva/clients.php
2019-03-24 15:06:16 +01:00
Laurent Destailleur
2034ac61ef
Fix phpcs
2019-03-24 15:05:02 +01:00
Ion
7bfa49b29c
FIX: Disallow line start date > end date
2019-03-24 14:30:00 +01:00
Laurent Destailleur
20f3af066c
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/tva/clients.php
2019-03-23 22:44:14 +01:00
Laurent Destailleur
79ed4bc80b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
2019-03-23 22:36:04 +01:00
Laurent Destailleur
28fede950f
Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into
...
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
2019-03-22 13:00:48 +01:00
Laurent Destailleur
a7181750c6
Merge pull request #10879 from altatof/noconcatdesc
...
NEW : add constant NO_CONCAT_DESCRIPTION
2019-03-22 12:56:46 +01:00
Laurent Destailleur
37cc5b7d35
Merge pull request #10901 from fmarcet/8.0
...
FIX: The minimum amount filter does not work in VAT report by customer
2019-03-22 12:27:30 +01:00
Ferran Marcet
f37c1b9287
FIX: The minimum amount filter does not work in the VAT report per customer
2019-03-22 09:28:50 +01:00
Laurent Destailleur
48a0c447b4
Fix test on draft status regression
2019-03-21 21:00:06 +01:00
Laurent Destailleur
ee4150665e
Fix phpcs
2019-03-21 20:15:19 +01:00
Laurent Destailleur
5693fbfe97
Merge pull request #10898 from grandoc/new_branch_21_03_2019
...
add some comments
2019-03-21 18:29:11 +01:00
Laurent Destailleur
47eb256b82
Fix phpcs
2019-03-21 18:22:17 +01:00
Laurent Destailleur
930720decd
WIP Start to replace use of property ->brouillon
2019-03-21 18:13:51 +01:00
Laurent Destailleur
90df30e412
NEW Add trigget FICHINTER_UNVALIDATE
...
Standardize code of setDraft.
2019-03-21 17:37:56 +01:00
Philippe GRAND
cb59f52a55
add some comments
2019-03-21 15:01:09 +01:00
Philippe GRAND
86c3b1a5b0
add some comments
2019-03-21 14:59:21 +01:00
Laurent Destailleur
5d21547854
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/product/price.php
htdocs/user/perms.php
2019-03-21 12:20:24 +01:00
Frédéric FRANCE
89e8889c5c
phpcs fix v9
2019-03-19 16:33:34 +01:00
Laurent Destailleur
eab11ce743
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2019-03-19 13:14:44 +01:00
Laurent Destailleur
dbe15d3685
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-03-19 13:10:17 +01:00
Laurent Destailleur
b11403103b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-03-19 13:09:48 +01:00
Laurent Destailleur
8664594fc8
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-03-19 13:09:39 +01:00
Laurent Destailleur
eaaea2c2f9
Fix set of due date when invoice created from API
2019-03-19 12:08:55 +01:00
Laurent Destailleur
bca10084c5
Merge pull request #10882 from alexandreaj/patch-1
...
Update api_invoices.class.php
2019-03-19 12:07:16 +01:00
Laurent Destailleur
70cb042e58
Update api_invoices.class.php
2019-03-19 12:06:57 +01:00
Laurent Destailleur
b10690ce88
Merge pull request #10874 from grandoc/translation
...
translation
2019-03-19 11:14:40 +01:00
Laurent Destailleur
6bead00260
Better text
2019-03-19 10:27:36 +01:00
Laurent Destailleur
3f62098b81
Add hours in date
2019-03-19 10:14:13 +01:00
alexandreaj
9bb1ede65a
Update api_invoices.class.php
...
Adding possibility to set due date (date_lim_reglement field in mysql) via the API.
2019-03-18 21:11:13 +01:00
Laurent Destailleur
41c737a213
Fix, Oops, test was inverted
2019-03-18 20:16:19 +01:00
Laurent Destailleur
aa013ff753
Fix do we really must copy notes when creating an object from another
...
source object? Add a hack with hidden option to be able to change this.
2019-03-18 20:09:09 +01:00
Christophe Battarel
8b3fd2eacf
NEW : add constant NO_CONCAT_DESCRIPTION
2019-03-18 16:10:17 +01:00
Philippe GRAND
c13a1dbc63
translation
2019-03-18 13:45:24 +01:00
Philippe GRAND
0f03b16313
translation
2019-03-18 12:46:32 +01:00
Laurent Destailleur
89087c6847
Merge pull request #10800 from atm-quentin/FIX_wrong_vat_deposit_invoice
...
Wrong vat if deposit from propal with multiple vat
2019-03-18 11:14:11 +01:00
Regis Houssin
57091f08b0
FIX missing entity filter and wrong var name
2019-03-18 10:53:43 +01:00
Laurent Destailleur
f3cf3482fa
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
htdocs/projet/element.php
2019-03-18 10:23:14 +01:00
Laurent Destailleur
34034787af
FIX problem with sign of various payment in project preview
2019-03-18 10:16:08 +01:00
Laurent Destailleur
1abfd1f58e
Add page to setup module debugbar
...
Fix CSS
2019-03-17 00:32:39 +01:00
Laurent Destailleur
7cdfff7263
Fix syntax error
2019-03-15 20:42:49 +01:00
Laurent Destailleur
875b5b6a8d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/card.php
htdocs/projet/card.php
htdocs/public/opensurvey/studs.php
2019-03-15 19:20:22 +01:00
Laurent Destailleur
39e24d30aa
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-03-15 19:18:30 +01:00
Laurent Destailleur
681d626284
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-03-15 19:17:31 +01:00
Laurent Destailleur
b33c366b02
Update card.php
2019-03-15 19:16:49 +01:00
Laurent Destailleur
c0b6699b25
All methods set_draft() were renamed into setDraft()
2019-03-15 19:01:40 +01:00
Laurent Destailleur
a2d6723ff3
WIP Link files to expense report lines
2019-03-15 15:07:52 +01:00
Laurent Destailleur
bcf0dd0168
Merge branch 'develop' into patch-5
2019-03-14 16:47:08 +01:00
Laurent Destailleur
cdf6e4b65a
Fix some PSR rules
2019-03-14 16:43:27 +01:00
Frédéric FRANCE
321a919fb1
Update result.php
2019-03-14 16:42:35 +01:00
florian HENRY
9bcb91a122
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2019-03-14 13:02:09 +01:00
gauthier
a524bbc5c6
FIX : when we create deposit with multi tva, we mustn't add line if amount = 0 (example when we have a 100% reduc on one of origin invoice line)
2019-03-13 15:59:41 +01:00
Laurent Destailleur
eeafc3c630
Standardize translation of amount
2019-03-13 14:10:36 +01:00
Laurent Destailleur
98ca9bf17a
Reduce quantity of string to translates
2019-03-12 19:44:59 +01:00
florian HENRY
9968fae9dc
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2019-03-12 17:25:00 +01:00
Joan Louis
17647de4cc
Fix extrafields calls from cards for Dolibarr 8 See #10803
2019-03-12 11:24:54 +01:00
Joan Louis
f326c75be7
Update call to extrafields from cards
2019-03-11 21:34:16 +01:00
florian HENRY
53a76e91b4
fix missing test on method result
2019-03-11 21:25:51 +01:00
Joan Louis
ee5753819e
Update call to extrafields from cards
2019-03-11 14:22:04 +01:00
atm-quentin
ab781c32c7
Wrong vat if deposit from propal with multiple vat
2019-03-11 11:28:25 +01:00
Laurent Destailleur
f3ca69522e
Fix phpcs
2019-03-11 01:41:09 +01:00
Alexandre SPANGARO
ad485b55b6
NEW: Add category to bank transaction in various payment
2019-03-10 20:01:39 +01:00
Laurent Destailleur
9a5497b940
Merge pull request #10776 from frederic34/patch-3
...
do not trim int
2019-03-08 19:38:44 +01:00
Frédéric FRANCE
3dd4f0bfff
do not trim int
2019-03-07 22:17:48 +01:00
Frédéric FRANCE
d96cc53f97
replace html by html5 in fourn
2019-03-07 20:46:38 +01:00
Laurent Destailleur
1fb86e12e5
Merge manually some enhancement from #10507
2019-03-07 13:02:51 +01:00
Laurent Destailleur
a426c8e9bf
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/compta/facture/class/facture.class.php
htdocs/filefunc.inc.php
htdocs/install/upgrade2.php
htdocs/product/class/product.class.php
2019-03-07 11:16:24 +01:00
Laurent Destailleur
b15e00cae7
FIX Autodetect buy price for invoices autogenerated with templates.
2019-03-06 21:39:09 +01:00
Frédéric FRANCE
f283782445
change visibility
2019-03-04 19:57:46 +01:00
Laurent Destailleur
63d14b16c9
FIX The notes was also copied on invoice
2019-03-04 14:56:39 +01:00
Laurent Destailleur
db13e54724
FIX The notes was also copied on invoice
2019-03-04 14:54:59 +01:00
Laurent Destailleur
1686b7b1db
FIX label of bank account
2019-03-04 14:42:00 +01:00
Laurent Destailleur
fe5cb57df8
FIX label of bank account
2019-03-04 14:41:20 +01:00
Laurent Destailleur
4cb5c9ef35
Var not initialized
2019-03-02 19:26:01 +01:00
Laurent Destailleur
a5711a51ab
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/json.lib.php
test/phpunit/JsonLibTest.php
2019-03-02 18:30:17 +01:00
Laurent Destailleur
4f9981063f
Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing
2019-03-02 18:26:50 +01:00
Laurent Destailleur
50f6bbefe7
Merge pull request #10720 from frederic34/patch-5
...
Update facture-rec.class.php
2019-03-02 18:23:26 +01:00
Laurent Destailleur
56d921ea52
CSS
2019-03-02 12:57:07 +01:00
Frédéric FRANCE
728a3fcbba
Update facture-rec.class.php
2019-03-02 08:43:09 +01:00
Frédéric FRANCE
4fcde0eaa3
Update facture-rec.class.php
2019-03-02 01:37:49 +01:00
Frédéric FRANCE
62501b11e8
add visibility
2019-03-02 00:14:22 +01:00
Frédéric FRANCE
014f69850e
add visibility
2019-03-01 23:08:57 +01:00
Frédéric FRANCE
be8db31388
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-03-01 19:24:27 +01:00
Frédéric FRANCE
bd2e541fd6
add visibility
2019-03-01 18:28:51 +01:00
Laurent Destailleur
2e128a786b
NEW Can change the customer account of an instance
2019-03-01 15:38:15 +01:00
Frédéric FRANCE
796ea6f4ea
add visibility
2019-02-28 23:19:58 +01:00
Laurent Destailleur
b3fb0eaf5b
Merge branch 'develop' into Squiz.Scope.MethodScope.Missing
2019-02-27 15:48:31 +01:00
Laurent Destailleur
2448d1deaa
fk_projet -> fk_project
2019-02-27 15:32:18 +01:00
Laurent Destailleur
3bffa69f1d
Remove deprecated code
2019-02-27 15:23:56 +01:00
Laurent Destailleur
da826c4bc7
Fix bad var name
2019-02-27 01:22:26 +01:00
Frédéric FRANCE
81f2f99db5
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-02-26 21:16:01 +01:00
Laurent Destailleur
3ec2338c2d
Look and feel v10
2019-02-26 19:37:32 +01:00
Frédéric FRANCE
346d1f410c
wip
2019-02-25 23:15:48 +01:00
Laurent Destailleur
8a9339a059
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/compta/facture/class/api_invoices.class.php
2019-02-25 15:16:23 +01:00
Laurent Destailleur
dde18e803d
Fix transaction
2019-02-25 15:09:56 +01:00
Laurent Destailleur
3fa2680859
Merge pull request #10669 from frederic34/html5fix
...
replace by html5 in ticket supplier_proposal, stripe, societe
2019-02-24 20:36:24 +01:00
Laurent Destailleur
3f078203b9
Fix phpcs
2019-02-24 20:29:01 +01:00
Frédéric FRANCE
4f341ea022
replace html code by html5
2019-02-23 22:56:38 +01:00
Frédéric FRANCE
4b0b8e1c1f
Update api_invoices.class.php
2019-02-23 16:44:36 +01:00
Frédéric FRANCE
0e093ffb24
Update api_invoices.class.php
2019-02-23 16:41:40 +01:00
Frédéric FRANCE
f1e4c80771
Update api_invoices.class.php
2019-02-23 16:39:15 +01:00
Laurent Destailleur
f83f746123
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
2019-02-23 16:03:40 +01:00
Laurent Destailleur
cdf85b0d00
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-23 16:02:35 +01:00
ptibogxiv
d7ffcca59b
FIX fetch module / pos source
2019-02-23 16:00:07 +01:00
Laurent Destailleur
0298582fc3
Merge pull request #10640 from ptibogxiv/patch-122
...
FIX fetch module / pos source
2019-02-23 15:59:22 +01:00
Laurent Destailleur
9ba6e3f8f5
FIX #10638
2019-02-23 15:57:57 +01:00
Laurent Destailleur
2413c41622
Merge pull request #10639 from ptibogxiv/patch-121
...
NEW POS support in order (ex: online cart)
2019-02-23 15:19:10 +01:00
Laurent Destailleur
b3c3e8f09e
Merge pull request #10547 from Rusu-Marian-Dan/develop
...
New API markAsCreditAvailable
2019-02-23 14:39:13 +01:00
Laurent Destailleur
ca45651265
Update api_invoices.class.php
2019-02-23 14:38:13 +01:00
Laurent Destailleur
eb733728c3
Update api_invoices.class.php
2019-02-23 14:37:09 +01:00
Laurent Destailleur
5bf3a1f175
Update api_invoices.class.php
2019-02-23 14:36:51 +01:00
Laurent Destailleur
3d0af97e79
Update api_invoices.class.php
2019-02-23 14:24:37 +01:00
Cristian Torres
8ca6935f8b
[FIX] Variable $i is already declared
...
It was preventing displaying of the other accounts
2019-02-23 14:08:11 +01:00
Laurent Destailleur
59218de7de
Merge pull request #10637 from tony13tv/patch-1
...
[FIX] Variable $i is already declared
2019-02-23 14:07:46 +01:00
ptibogxiv
98affe0921
Update facture.class.php
2019-02-20 14:25:25 +01:00
ptibogxiv
152585c1b8
Update facture.class.php
2019-02-20 13:20:46 +01:00
ptibogxiv
ef5372f476
Update facture.class.php
2019-02-20 13:04:22 +01:00
ptibogxiv
6416f24d5f
FIX fetch module / pos source
2019-02-20 12:35:13 +01:00
ptibogxiv
c0de2b5b07
Update facture.class.php
2019-02-20 12:22:02 +01:00
Laurent Destailleur
4296f959ca
Invert option MAIN_HIDE_VERSION into ! MAIN_SHOW_VERSION
...
Reorganize levels of menu accountancy
2019-02-20 04:55:35 +01:00
Cristian Torres
7128270a95
[FIX] Variable $i is already declared
...
It was preventing displaying of the other accounts
2019-02-19 11:37:46 -06:00
Laurent Destailleur
86c9dbc218
Merge branch 'develop' into new_branch_14_02_2019
2019-02-19 13:26:35 +01:00
Laurent Destailleur
e4698fb6a5
Merge
2019-02-18 19:14:25 +01:00
Laurent Destailleur
ad7b8371da
FIX Mark credit note as available for credit note in other currency
...
Conflicts:
htdocs/compta/paiement.php
htdocs/core/class/discount.class.php
2019-02-18 18:30:15 +01:00
Laurent Destailleur
07d1559802
FIX Mark credit note as available for credit note in other currency
2019-02-18 18:27:06 +01:00
Laurent Destailleur
b2ec340a48
FIX Show button POS Ticket only if invoice was generated by POS
2019-02-18 17:04:53 +01:00
Dan Rusu
75e52628ec
Merge remote-tracking branch 'upstream/develop' into develop
2019-02-16 09:07:44 +02:00
Philippe Grand
40345ea0f5
Update paiement_charge.php
...
fixed...
2019-02-15 17:38:35 +01:00
Laurent Destailleur
3f01b590fe
Merge pull request #10609 from frederic34/patch-17
...
Update api_invoices.class.php
2019-02-15 15:11:33 +01:00
Philippe Grand
7cb4455729
Update paiement.php
2019-02-15 10:42:06 +01:00
Philippe Grand
55dc5677b2
Update clients.php
2019-02-15 10:40:30 +01:00
Philippe Grand
18dbad0d42
Update list.php
...
We gone make it :)
2019-02-15 10:38:03 +01:00
Philippe Grand
348b6c9f69
Update list.php
2019-02-15 09:45:08 +01:00
Philippe Grand
88d84332e9
Update clients.php
2019-02-15 09:42:39 +01:00
Philippe Grand
a8fdcff934
Update paiement.php
2019-02-15 09:38:57 +01:00
Frédéric FRANCE
b892fc7182
Update api_invoices.class.php
2019-02-14 18:22:35 +01:00
Frédéric FRANCE
dc054e56ec
Update compta-files.php
2019-02-14 18:10:10 +01:00
Philippe GRAND
ec370e247a
update with html5 compliant code
2019-02-14 16:59:24 +01:00
Philippe GRAND
43486828db
update with html5 compliant code
2019-02-14 16:56:49 +01:00
Philippe GRAND
a6cc8278c8
update with html5 compliant code
2019-02-14 16:54:53 +01:00
Philippe GRAND
5b2c80b62d
update with html5 compliant code
2019-02-14 16:51:09 +01:00
Philippe GRAND
91fca7a1af
update with html5 compliant code
2019-02-14 16:48:10 +01:00
Philippe GRAND
2507ff9684
update with html5 compliant code
2019-02-14 16:45:49 +01:00
Philippe GRAND
ed1a59d00b
update with html5 compliant code
2019-02-14 16:43:40 +01:00
Philippe GRAND
1f2dd3bc29
update with html5 compliant code
2019-02-14 16:38:03 +01:00
Philippe GRAND
69f350eb0e
update with html5 compliant code
2019-02-14 16:33:38 +01:00
ptibogxiv
7f3f166a81
NEW link/delete contact in invoice object
2019-02-14 00:44:40 +01:00
Laurent Destailleur
b9467c10bf
Merge pull request #10561 from eoxia-jimmy/develop
...
NEW: API Proposal, Orders, Invoices: Add contact details
2019-02-13 16:39:57 +01:00
Laurent Destailleur
e18ff7d087
Merge pull request #10568 from frederic34/patch-20
...
Update facture-rec.class.php
2019-02-13 16:36:54 +01:00
florian HENRY
dd9896516b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_importproduct_measuringunit
Conflicts:
htdocs/margin/agentMargins.php
htdocs/product/stock/movement_card.php
htdocs/projet/tasks/time.php
htdocs/resource/class/html.formresource.class.php
2019-02-13 12:52:07 +01:00
Laurent Destailleur
04e3f23476
Fix phpcs
2019-02-13 11:52:45 +01:00
Laurent Destailleur
5c27ec5d25
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/compta/compta-files.php
2019-02-13 11:21:20 +01:00
florian HENRY
de87321c15
fix travcis
2019-02-13 10:28:08 +01:00
florian HENRY
e2d13c0e1f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_importproduct_measuringunit
Conflicts:
htdocs/contact/consumption.php
htdocs/webservices/server_productorservice.php
2019-02-13 09:23:52 +01:00
florian HENRY
5c059c897d
fix travis (mosty for dev no conerne by my changes)
2019-02-13 09:21:14 +01:00
Frédéric FRANCE
56bbe41917
Update facture-rec.class.php
2019-02-12 23:54:38 +01:00
Laurent Destailleur
d42bf54436
Fix export zip
2019-02-12 23:12:33 +01:00
Laurent Destailleur
036dc52170
Fix test
2019-02-12 19:55:54 +01:00
Laurent Destailleur
5a2161ad09
Debug export of zip
2019-02-12 19:47:46 +01:00
Laurent Destailleur
666d03f596
Fix multicompany for page to export zip of invoices
2019-02-12 18:15:30 +01:00
Laurent Destailleur
68e6f32320
css
2019-02-12 17:56:03 +01:00
Jimmy L
a172ea00a4
Rest API: Proposal, Orders, Invoices: Add contact details
2019-02-12 17:54:59 +01:00
Laurent Destailleur
3d3aca804f
Merge pull request #10554 from grandoc/new_branch_12_02_2019
...
update with html5 compliant code
2019-02-12 16:57:11 +01:00
Alexandre SPANGARO
7e60c3bf84
FIX: In various payment, subledger & accout may be alphanumeric
2019-02-12 16:27:25 +01:00
Philippe GRAND
f7a28328ed
update with html5 compliant code
2019-02-12 15:40:16 +01:00
Philippe GRAND
60e503c7d1
update with html5 compliant code
2019-02-12 15:02:54 +01:00
Philippe GRAND
5007ef82c8
update with html5 compliant code
2019-02-12 14:56:38 +01:00
Philippe GRAND
fd6eaf8c3d
update with html5 compliant code
2019-02-12 14:53:35 +01:00
Philippe GRAND
66e8380a4a
update with html5 compliant code
2019-02-12 14:48:07 +01:00
Philippe GRAND
e10d1eb365
update with html5 compliant code
2019-02-12 14:44:25 +01:00
Philippe GRAND
8a62c9bc5f
update with html5 compliant code
2019-02-12 14:40:30 +01:00
Laurent Destailleur
46941d4c20
Merge pull request #10539 from frederic34/patch-17
...
Update paiement.php
2019-02-12 13:43:09 +01:00
Laurent Destailleur
3e1b75e916
Merge pull request #10541 from grandoc/new_branch_10_02_2019
...
update with html5 compliant code
2019-02-12 13:35:27 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
2019-02-12 13:33:39 +01:00
Laurent Destailleur
6f6a767255
Merge pull request #10520 from aspangaro/develop
...
NEW: Add subledger in various payment
2019-02-12 13:20:58 +01:00
Dan Rusu
57e2971a22
fix code indent
2019-02-11 19:58:01 +02:00
Laurent Destailleur
5c01ec158d
Fix regression
2019-02-11 15:40:33 +01:00
Dan Rusu
9ce4b91f5d
NEW | make credit note from invoice
...
inspired from the action of the button "Make credit note" from UI.
- load invoice data and lines
- check invoice type
- calculate totals and create new credit notes
- create DiscountAbsolute & commit changes
2019-02-11 09:31:43 +02:00
Dan Rusu
0698ddbd77
Revert "add API method to create credit note from invoice"
...
This reverts commit 288a876491
2019-02-11 09:24:16 +02:00
Dan Rusu
288a876491
add API method to create credit note from invoice
2019-02-11 09:14:06 +02:00
Philippe Grand
d589ba4847
Update clientfourn.php
...
fixed...
2019-02-10 19:13:11 +01:00
Philippe GRAND
0911631b47
update with html5 compliant code
2019-02-10 16:31:34 +01:00
Philippe GRAND
0d5726b70a
update with html5 compliant code
2019-02-10 16:08:03 +01:00
Philippe GRAND
5d6ebad557
update with html5 compliant code
2019-02-10 16:05:06 +01:00
Philippe GRAND
9670228f06
update with html5 compliant code
2019-02-10 16:00:59 +01:00
Philippe GRAND
d42ef14a92
update with html5 compliant code
2019-02-10 15:59:19 +01:00
Philippe GRAND
20c0af1f57
update with html5 compliant code
2019-02-10 11:04:09 +01:00
Philippe GRAND
1b25d284a2
update with html5 compliant code
2019-02-10 11:01:23 +01:00
Philippe GRAND
89351e6027
update with html5 compliant code
2019-02-10 10:56:34 +01:00
Philippe GRAND
e7f2b92eca
update with html5 compliant code
2019-02-10 10:49:42 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
Philippe GRAND
2624865632
update with html5 compliant code
2019-02-10 10:38:50 +01:00
Philippe GRAND
83b95ae6cc
update with html5 compliant code
2019-02-10 10:25:20 +01:00
Philippe GRAND
19885cb465
update with html5 compliant code
2019-02-10 10:23:37 +01:00
Philippe GRAND
673e09d7c2
update with html5 compliant code
2019-02-10 10:21:54 +01:00
Philippe GRAND
508d6345a1
update with html5 compliant code
2019-02-10 10:16:58 +01:00
Philippe GRAND
c071e488cf
update with html5 compliant code
2019-02-10 10:10:41 +01:00
Frédéric FRANCE
2020e199b2
Update paiement.php
2019-02-09 16:35:10 +01:00
Frédéric FRANCE
580e5c42d2
GenericFunctionsFunctionCallArgumentSpacing
2019-02-09 12:00:49 +01:00
Laurent Destailleur
0e42e8824b
Merge branch 'develop' into new_branch_04_02_2019
2019-02-08 09:42:18 +01:00
Laurent Destailleur
8abebb091c
Var no more used
2019-02-08 09:33:01 +01:00
Laurent Destailleur
24955088de
Merge pull request #10501 from hregis/8.0_mc
...
FIX [URGENT] broken feature, "$usercancreate" is for Dolibarr 9
2019-02-08 09:31:26 +01:00
Alexandre SPANGARO
2ba8ae00e4
Merge remote-tracking branch 'upstream/develop' into develop
2019-02-06 21:56:01 +01:00
Alexandre SPANGARO
a28c926f03
Fix
2019-02-06 21:43:16 +01:00
gauthier
29e4fce450
FIX : can't add lines on invoices
2019-02-06 12:35:23 +01:00
Regis Houssin
8860eab6b1
FIX wrong merged conflict
2019-02-05 07:40:50 +01:00
Regis Houssin
4a19cba257
FIX [URGENT] broken feature, "$usercancreate" is for Dolibarr 9
2019-02-05 06:34:05 +01:00
Philippe GRAND
6b9b17f93e
update with html5 compliant code
2019-02-04 13:57:38 +01:00
Philippe GRAND
a14332b2b0
update with html5 compliant code
2019-02-04 13:51:39 +01:00
Philippe GRAND
28a2135409
update with html5 compliant code
2019-02-04 13:45:50 +01:00
Philippe GRAND
386a4102b7
update with html5 compliant code
2019-02-04 13:44:02 +01:00
Philippe GRAND
b7605e233e
update with html5 compliant code
2019-02-04 13:40:00 +01:00
Laurent Destailleur
3babc11312
Fix phpcs
2019-02-04 02:06:32 +01:00
Frédéric FRANCE
e1e14ae6e6
wip
2019-02-03 22:58:56 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
Laurent Destailleur
57f81217ee
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/localtax/index.php
htdocs/compta/tva/index.php
2019-02-03 21:14:44 +01:00
Laurent Destailleur
efe5cd3dd8
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-02-03 21:13:06 +01:00
Laurent Destailleur
cdfeeafab9
FIX #10381
2019-02-03 21:12:05 +01:00
Laurent Destailleur
af9e2d07d2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/compta/paiement.php
htdocs/fourn/facture/paiement.php
2019-02-03 20:38:47 +01:00
Laurent Destailleur
4b77b3ff23
NEW Support tag {ccc} on payment ref
2019-02-03 20:36:20 +01:00
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma
2019-02-03 19:27:16 +01:00
Frédéric FRANCE
273d68381c
psr2 end file new line none found
2019-02-03 15:21:21 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-03 14:29:45 +01:00
Alexandre SPANGARO
13cf3b1d7f
Add subledger in various payment
2019-02-01 15:50:12 +01:00
Frédéric FRANCE
b766204690
wip
2019-01-30 22:53:47 +01:00
Frédéric FRANCE
f83ee43a19
Merge branch 'develop' into nospaceaftercomma
2019-01-30 22:15:22 +01:00
Laurent Destailleur
a23fd6f090
Fix phpcs
2019-01-30 20:55:55 +01:00
Laurent Destailleur
01f1f6162f
Fix phpcs
2019-01-30 20:06:21 +01:00
Laurent Destailleur
15bd99acf4
Fix phpcs
2019-01-30 20:06:05 +01:00
Laurent Destailleur
2882f45bca
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-30 18:55:01 +01:00
Laurent Destailleur
f67937c59d
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-30 18:54:29 +01:00
Laurent Destailleur
ae1c4e065b
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-01-30 18:53:56 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
Laurent Destailleur
9fdba921b4
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
2019-01-30 16:48:33 +01:00
Laurent Destailleur
81ae4c52c5
Merge pull request #10446 from mapiolca/8.0
...
Fix #10317 et #10318
2019-01-30 16:43:14 +01:00
Laurent Destailleur
e72d6c50e6
Merge pull request #10428 from frederic34/toomanylines
...
PSR2.Files.EndFileNewline.TooMany
2019-01-30 16:17:09 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma
2019-01-30 16:00:11 +01:00
Pierre Ardoin
30548d977f
Prise en charge des Travaux supplémentaires
...
Corrige la filtration pour permettre l'ajout de ligne lors de la présence de travaux supplémentaires en cours de chantier.
2019-01-29 11:19:11 +01:00
Alexandre SPANGARO
cc88c4f8ff
Move my email to the new one
2019-01-28 21:39:22 +01:00
Frédéric FRANCE
77747ac2a3
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-28 16:35:12 +01:00
Laurent Destailleur
0827929ede
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2019-01-28 16:29:34 +01:00
John BOTELLA
6f12cdf236
Fix travis
2019-01-28 11:58:16 +01:00
John BOTELLA
5dbc9ddae0
fix travis
2019-01-28 11:56:20 +01:00
Laurent Destailleur
f7bcd1ef6d
Fix trans
2019-01-28 01:35:12 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
Laurent Destailleur
ecc30b8ffe
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2019-01-27 18:27:58 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines
2019-01-27 17:59:13 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany
2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged
2019-01-27 10:49:34 +01:00
Laurent Destailleur
ba87284a90
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-26 14:30:44 +01:00
Laurent Destailleur
e46fb303d0
Merge pull request #10386 from atm-florian/dev_newhiglightinvoice_onpayment
...
NEW show in blod invoice amount where we came from when making payment
2019-01-26 14:29:20 +01:00
Laurent Destailleur
adb7ec7015
Merge pull request #10399 from grandoc/new_branch_23_01_2019
...
update with html5 compliant code
2019-01-26 14:02:26 +01:00
Laurent Destailleur
6b4b03e6aa
Merge pull request #10405 from grandoc/new_branch_24_01_2019
...
update with html5 compliant code
2019-01-26 13:52:10 +01:00
Laurent Destailleur
63e04823b2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-25 11:57:01 +01:00
Laurent Destailleur
63c66095e6
Work on file export
2019-01-25 11:56:50 +01:00
Laurent Destailleur
a5daa25707
Move common code to get sell price into a method
2019-01-24 19:45:17 +01:00
Philippe GRAND
c1b0d3667a
update with html5 compliant code
2019-01-24 16:47:19 +01:00
Philippe GRAND
0b353dc560
update with html5 compliant code
2019-01-24 16:43:28 +01:00
Philippe GRAND
7c086ba8ed
update with html5 compliant code
2019-01-24 10:02:06 +01:00
Philippe GRAND
1599f165ee
update with html5 compliant code
2019-01-24 09:57:39 +01:00
Philippe GRAND
7ff1555e58
update with html5 compliant code
2019-01-23 17:39:40 +01:00
John BOTELLA
624d17c96a
Fix missing no trigger arg
2019-01-23 17:32:49 +01:00
John BOTELLA
1c51716997
Fix missing trigger
2019-01-23 17:02:20 +01:00
gauthier
84e1f92acd
FIX : when we add a payment on an invoice which already has payments with credit note or deposit amount, and then we get an excess received, discount amount must be $total_paiements + $total_creditnote_and_deposit - $object->total_ttc;
2019-01-23 15:16:51 +01:00
Laurent Destailleur
fbf5a1c056
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-21 20:48:19 +01:00
florian HENRY
a5cbef7aec
new show in blod invoice amount where we came from for payment
2019-01-21 11:51:54 +01:00
Frédéric FRANCE
4ab19c25c8
add missing global $conf in bonprelevement class
2019-01-21 08:23:31 +01:00
Laurent Destailleur
c26f264cac
Merge pull request #10369 from mwelters/mwelters/addays
...
Add configurable days to SEPA Withdrawal Execution Date
2019-01-20 19:47:57 +01:00
markus
a45ea9239d
Rename consts and cleanup
2019-01-19 14:24:20 +01:00
Laurent Destailleur
300889f53a
# WARNING: head commit changed in the meantime
...
Fix
2019-01-19 13:22:38 +01:00
Laurent Destailleur
2bbaae88d6
Fix standardize 'createfromclone' param when cloning
2019-01-19 12:46:38 +01:00
markus
de9b8f427d
Add configurable days to SEPA Withdrawal Execution Date
2019-01-18 16:16:55 +01:00
Philippe GRAND
0290b74495
update with html5 compliant code
2019-01-18 10:18:18 +01:00
Philippe GRAND
44708ce7d5
update with html5 compliant code
2019-01-18 10:16:51 +01:00
Philippe GRAND
539660a45d
update with html5 compliant code
2019-01-18 10:13:05 +01:00
Philippe GRAND
8096844062
update with html5 compliant code
2019-01-18 10:10:39 +01:00
Philippe GRAND
68c6ccae22
update with html5 compliant code
2019-01-18 10:06:45 +01:00
Laurent Destailleur
58bda12e22
css
2019-01-17 19:31:01 +01:00
Laurent Destailleur
5130019003
css
2019-01-17 19:27:26 +01:00
Laurent Destailleur
2e55bdf087
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-17 19:11:18 +01:00
Laurent Destailleur
16bb85b7fa
Merge pull request #10348 from a-schild/9.0
...
Fix for issue #10333 branch 9.0
2019-01-17 18:58:49 +01:00
Laurent Destailleur
67efae20f4
Fix css
2019-01-17 17:23:54 +01:00
Laurent Destailleur
ab5aaa6b43
Start debug compta-files
2019-01-17 00:32:43 +01:00
Laurent Destailleur
889ce7fc5d
Start debug compta-files
2019-01-17 00:09:05 +01:00
Laurent Destailleur
8d4d1dbf99
Fix phpcs
2019-01-16 18:51:51 +01:00
Laurent Destailleur
3a8afafabd
Merge pull request #10027 from atm-quentin/NEW_manage_multicompany_for_invoice
...
New manage multicompany for invoice
2019-01-16 18:51:01 +01:00
Laurent Destailleur
f8973c9a22
Fix translation Late <> Alert
2019-01-16 17:44:39 +01:00
Laurent Destailleur
e7943ae844
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-16 16:48:52 +01:00
Laurent Destailleur
d3828130ab
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/adherents/class/adherent.class.php
2019-01-16 16:48:21 +01:00
a-schild
7e3bfd332e
Fix for issue #10333
...
paymentterm.class.php invalid SQL in fetch
2019-01-16 13:07:00 +01:00
a-schild
7df86cb630
Fix for issue #10333
...
paymentterm.class.php invalid SQL in fetch
2019-01-16 13:06:12 +01:00
a-schild
2f5db98a5c
Fix for issue #10333
...
paymentterm.class.php invalid SQL in fetch
2019-01-16 13:05:22 +01:00
atm-quentin
013c078c8b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice
2019-01-16 10:52:46 +01:00
atm-quentin
0d384eea00
FIX credit note can have negative value
2019-01-16 09:33:24 +01:00
André Schild
1c0e15192d
Fix for issue #10333
...
paymentterm.class.php invalid SQL in fetch
2019-01-15 20:43:16 +01:00
delcroix Patrick
9d2d4bc91d
Fix compatibiliy issue with pgSQL
2019-01-15 17:06:48 +01:00
Laurent Destailleur
19be47dbf7
Code comment
2019-01-12 01:22:08 +01:00
Laurent Destailleur
22d4afbb62
Missing trans
2019-01-10 01:54:06 +01:00
Laurent Destailleur
48e407740d
Fix tooltip
2019-01-10 01:49:49 +01:00
Laurent Destailleur
fbd490da15
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-09 13:29:47 +01:00
Laurent Destailleur
d1e062cafa
FIX When changing date of payment, change also record in bank if not
...
conciliated yet.
2019-01-09 13:28:12 +01:00
Laurent Destailleur
d9999d61f6
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-09 12:27:25 +01:00
Laurent Destailleur
890abd28d5
Fix look and feel v9
2019-01-09 12:26:49 +01:00
Laurent Destailleur
d929d93376
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-08 14:19:35 +01:00
diversity-co-uk
2dc87509ff
Fix Invoice PUT, remove extra parameter
...
The first parameter is expected to be the user.
The $id of the invoice is already contained in $this
See facture.class.php 1610:
function update(User $user, $notrigger=0)
2019-01-08 14:17:33 +01:00
Laurent Destailleur
126e02798a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/cashdesk.lang
htdocs/langs/fr_FR/cashdesk.lang
2019-01-07 19:49:15 +01:00
Laurent Destailleur
8b1455f29e
FIX Cash fence
2019-01-07 19:35:20 +01:00
Laurent Destailleur
527ef8bdc8
Add nb of invoice to help cash fence
2019-01-07 19:02:38 +01:00
mapiolca
bab82a77b5
Update card.php
...
Permettre d'ajouter des lignes complémentaires en cas de travaux supplémentaires lors des situations de travaux.
2019-01-05 22:42:51 +01:00
ldestailleur
451b3e30cc
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/cashdesk.lang
2019-01-04 19:36:20 +01:00
ldestailleur
1b19f5153b
Fix cash fence feature
2019-01-03 14:18:02 +01:00
ldestailleur
7cb3b8dfec
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-02 19:42:26 +01:00
ldestailleur
bc00fb177a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-02 19:42:15 +01:00
Laurent Destailleur
422e18ee8e
Merge pull request #10268 from hregis/develop_upgrade
...
FIX remove old unused and deprecated function "getStaticMember"
2019-01-02 19:37:49 +01:00
Alexandre SPANGARO
c4dbf41530
Look & feel
2018-12-30 21:21:40 +01:00
Alexandre SPANGARO
a2075b9d2c
V9 look & Feel, etc
2018-12-30 20:32:44 +01:00
ldestailleur
3af418349a
FIX Can't empty the payment mode
2018-12-29 07:54:30 +01:00
ldestailleur
0353bd5302
FIX sql error when resetting payment mode / term
2018-12-29 07:48:47 +01:00
ldestailleur
2225d0a41e
FIX sql error when resetting payment mode / term
2018-12-28 23:16:44 +01:00
Laurent Destailleur
0f76279a03
FIX Missing token and style
2018-12-27 03:46:14 +01:00
Laurent Destailleur
791b2f485a
FIX Missing token and style
2018-12-27 03:45:30 +01:00
Laurent Destailleur
5c516fdae2
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2018-12-26 19:43:01 +01:00
Regis Houssin
8f4c452075
FIX replace deprecated "print_fiche_titre" with "load_fiche_titre"
...
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
2018-12-25 08:34:26 +01:00
Laurent Destailleur
85375495e5
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/class/product.class.php
htdocs/public/notice.php
htdocs/user/card.php
2018-12-22 19:06:58 +01:00
Laurent Destailleur
9b55cc401e
Fix trans
2018-12-22 11:32:27 +01:00
Laurent Destailleur
ae6596cac7
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-21 09:57:29 +01:00
Laurent Destailleur
d9b8a8c8ae
Debug cash fence feature
2018-12-19 16:12:55 +01:00
Laurent Destailleur
b0652494b5
Debug cash fence
2018-12-19 15:40:01 +01:00
Laurent Destailleur
707af49025
FIX Missing last month on vat report per month
2018-12-19 12:07:26 +01:00
Laurent Destailleur
e014fdc20b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-17 11:43:02 +01:00
Laurent Destailleur
6b5c0d1ea1
Save cash fence event into unalterable log
2018-12-17 11:41:59 +01:00
Laurent Destailleur
e06b06c788
Work on cash fence
2018-12-17 10:37:56 +01:00
Laurent Destailleur
e0e298f07b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-17 03:26:15 +01:00
Laurent Destailleur
bf9ee18bed
Standardize code.
2018-12-17 03:25:45 +01:00
Laurent Destailleur
72c5943c55
Execute trigger so we can record line into unalterable log table
2018-12-16 17:53:23 +01:00
Laurent Destailleur
ce2d67f225
Fix phpcs
2018-12-16 17:45:51 +01:00
Laurent Destailleur
e5e4ef7b8c
Work on cash fence
2018-12-16 16:47:09 +01:00
Laurent Destailleur
9ce07b9582
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
2018-12-16 15:36:18 +01:00
Laurent Destailleur
e366d7d57c
Work on cash fence
2018-12-16 15:30:31 +01:00
Laurent Destailleur
988ba172ae
Clean code of POS modules
2018-12-16 14:59:51 +01:00
Laurent Destailleur
699766223f
Fix phpcs
2018-12-16 13:00:24 +01:00
Laurent Destailleur
5dc9b44931
Fix phpcs
2018-12-16 12:59:59 +01:00
Laurent Destailleur
54a4a54afe
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/langs/en_US/banks.lang
2018-12-15 20:00:31 +01:00
Laurent Destailleur
2bfc5fe235
Work on cash fence
2018-12-15 19:56:08 +01:00
Laurent Destailleur
1c49599a47
Work on cash fence feature
2018-12-15 19:46:51 +01:00
Laurent Destailleur
0451eb741b
Work on legal cash fence
2018-12-15 19:20:30 +01:00
Laurent Destailleur
8ce6f67773
Fix phpcs
2018-12-15 18:27:38 +01:00
andreubisquerra
cdaf048766
First CashControl version
2018-12-15 16:45:36 +01:00
Laurent Destailleur
1167d9aecb
Merge pull request #10206 from andreubisquerra/master
...
First CashControl version
2018-12-15 16:44:24 +01:00
Laurent Destailleur
eb66d45947
Merge branch 'develop' into 10.0_accoutancy_stats
2018-12-15 15:17:15 +01:00
Laurent Destailleur
f55db6dd84
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/resources/dbmodel/dolibarr_schema.mwb
2018-12-15 14:09:16 +01:00
Laurent Destailleur
ec3465e65f
Merge pull request #9995 from delcroip/develop
...
Add a link for compta-files.php in the accountancy leftmenue
2018-12-15 12:09:42 +01:00
Laurent Destailleur
b511a056f4
Fix phpcs
2018-12-15 11:48:21 +01:00
Laurent Destailleur
baf9b6f309
Fix regression (bad name of function)
2018-12-14 19:21:19 +01:00
Laurent Destailleur
38ddfd9a62
Merge pull request #10152 from defrance/patch-134
...
refactoring list.php with dol_sql_datefilter
2018-12-14 19:06:29 +01:00
Laurent Destailleur
59bc15377d
CSS
2018-12-14 18:58:55 +01:00
Laurent Destailleur
3571eaee3d
Merge branch 'develop' into NEW_change_order_concat_desc
2018-12-14 17:44:08 +01:00
Laurent Destailleur
abd09ae631
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2018-12-14 17:24:17 +01:00
PMickael
37daface19
[Accounting][VAT] Fix balance should be based on period
...
[Accounting][VAT] Fix balance should be based on period
2018-12-14 17:23:45 +01:00
